Merge branch 'testdouble:main' into rails-7-2

testdouble · Sep 12, 2024 · 59c4590 · 59c4590
2 parents 5429e5d + 86c7cbd
commit 59c4590
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
         ruby-version: ['3.0', '3.3']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.7.1
+* Add Rack 3.1 support [#163](https://github.com/testdouble/cypress-rails/pull/163)
+
 ## 0.7.0
 git
 * Add a `CYPRESS_RAILS_CYPRESS_DIR` option for cases where

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cypress-rails (0.7.0)
+    cypress-rails (0.7.1)
       puma (>= 3.8.0)
       railties (>= 5.2.0)
 
@@ -47,21 +47,19 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.11.2)
-      rdoc
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mini_portile2 (2.8.5)
     minitest (5.22.2)
     mutex_m (0.2.0)
     nio4r (2.7.0)
     nokogiri (1.16.2)
-      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.24.0)
     parser (3.3.0.5)
@@ -72,7 +70,7 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (3.0.9)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -97,10 +95,10 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.1.0)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     regexp_parser (2.9.0)
-    reline (0.4.2)
+    reline (0.5.7)
       io-console (~> 0.5)
     rexml (3.2.6)
     rubocop (1.59.0)
@@ -133,7 +131,7 @@ GEM
     standard-performance (1.3.1)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.20.2)
-    stringio (3.1.0)
+    stringio (3.1.1)
     thor (1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

diff --git a/example/Gemfile.lock b/example/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    cypress-rails (0.7.0)
+    cypress-rails (0.7.1)
       puma (>= 3.8.0)
       railties (>= 5.2.0)
 
@@ -134,7 +134,7 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (3.0.9)
+    rack (3.1.7)
     rack-proxy (0.7.7)
       rack
     rack-session (2.0.0)

diff --git a/lib/cypress-rails/server/puma.rb b/lib/cypress-rails/server/puma.rb
@@ -10,7 +10,8 @@ def self.create(app, port, host)
         default_options = {Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false}
         options = default_options # .merge(options)
 
-        conf = Rack::Handler::Puma.config(app, options)
+        puma_rack_handler = defined?(Rackup::Handler::Puma) ? Rackup::Handler::Puma : Rack::Handler::Puma
+        conf = puma_rack_handler.config(app, options)
         conf.clamp
         logger = (defined?(::Puma::LogWriter) ? ::Puma::LogWriter : ::Puma::Events).stdio
 

diff --git a/lib/cypress-rails/version.rb b/lib/cypress-rails/version.rb
@@ -1,3 +1,3 @@
 module CypressRails
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end