cypress-rails 0.7.0 → 0.8.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b5037ac29bfc53baf2b770242635353028792d2577b8468d848973272da2f76
-  data.tar.gz: 38da1e00388f74e87cd54ffd8e74ace953fc1ee2f69d231e83dd00a02eb04935
+  metadata.gz: 340bff5215842cc3afb419ff29bef8b977e573fdf5311711b4d0badaa05104d1
+  data.tar.gz: c720c43244302da09c9f63f416cba150926c0a6ef4cbf53bc2c418727dd3b87a
 SHA512:
-  metadata.gz: f6ba80e9f20f20bbac8a861f4f27cd5279a6d9b658a2331e9e10ccc8d4d8dbb425c18140ebebfd3f12fe314cb21678ce9b18be8d18aa16e54778b483eef66ee6
-  data.tar.gz: 465bd36d2bf6f42ee12c17bdeb38c465ad84168c98f984bfb1c050d1843b8c45305615a4c6c3f82b929a86281f2febbffab0905cd65b7c6456ae3184d52952de
+  metadata.gz: bfb0b42e92ad4e5b576264b18ba035964823cc32b3717979edd127ca14b17f14639cf14083390c27daa1740b0302c0ba9c8b1ba53bb531ca72a03bdd9e9e0798
+  data.tar.gz: 78f57627a4eec8c0ccde58b24b1e6104fe8164e11375a46561a5cf8fbcce12a9536041e60c7be431a7c389a00b3132db679a13b93f49810069e8a6271f255864

data/.github/workflows/main.yml

@@ -8,14 +8,19 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0']
+        ruby-version: ['3.0', '3.3']
+        gemfile: ['Gemfile', 'Gemfile_rails71']
+        exclude:
+          # Rails 7.2 requires Ruby 3.1+
+          - ruby-version: '3.0'
+            gemfile: 'Gemfile'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
       - name: Run tests
-        run: ./script/test
+        run: ./script/test ${{matrix.gemfile}}

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.8.0.rc1
+* Add compatibility with Rails 7.2
+
+## 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cypress-rails (0.7.0)
+    cypress-rails (0.8.0.rc1)
       puma (>= 3.8.0)
       railties (>= 5.2.0)
 
@@ -47,28 +47,30 @@ 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.15.0)
+    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.22.1)
-    parser (3.1.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
     psych (5.1.2)
       stringio
     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)
@@ -92,37 +94,48 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rdoc (6.6.2)
+    rake (13.1.0)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    regexp_parser (2.4.0)
-    reline (0.4.2)
+    regexp_parser (2.9.0)
+    reline (0.5.7)
       io-console (~> 0.5)
-    rexml (3.2.5)
-    rubocop (1.29.1)
+    rexml (3.2.6)
+    rubocop (1.59.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    standard (1.12.1)
-      rubocop (= 1.29.1)
-      rubocop-performance (= 1.13.3)
-    stringio (3.1.0)
+    standard (1.33.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.59.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.3)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.3.1)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.20.2)
+    stringio (3.1.1)
     thor (1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     zeitwerk (2.6.13)
 

data/lib/cypress-rails/launches_cypress.rb

@@ -14,7 +14,7 @@ module CypressRails
     end
 
     def call(command, config)
-      puts config.to_s
+      puts config
       @initializer_hooks.run(:before_server_start)
       if config.transactional_server
         @manages_transactions.begin_transaction

data/lib/cypress-rails/manages_transactions.rb

@@ -10,7 +10,6 @@ module CypressRails
       @connections = gather_connections
       @connections.each do |connection|
         connection.begin_transaction joinable: false, _lazy: false
-        connection.pool.lock_thread = true
       end
 
       # When connections are established in the future, begin a transaction too
@@ -26,7 +25,6 @@ module CypressRails
 
           if connection && !@connections.include?(connection)
             connection.begin_transaction joinable: false, _lazy: false
-            connection.pool.lock_thread = true
             @connections << connection
           end
         end
@@ -42,7 +40,6 @@ module CypressRails
 
       @connections.each do |connection|
         connection.rollback_transaction if connection.transaction_open?
-        connection.pool.lock_thread = false
       end
       @connections.clear
 
@@ -58,7 +55,14 @@ module CypressRails
     def gather_connections
       setup_shared_connection_pool
 
-      ActiveRecord::Base.connection_handler.connection_pool_list.map(&:connection)
+      ActiveRecord::Base.connection_handler.connection_pool_list.map do |pool|
+        # Rails 7.2+
+        if pool.respond_to?(:lease_connection)
+          pool.lease_connection
+        else
+          pool.connection
+        end
+      end
     end
 
     # Shares the writing connection pool with connections on

data/lib/cypress-rails/server/puma.rb

@@ -10,7 +10,8 @@ module CypressRails
         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
 

data/lib/cypress-rails/server.rb

@@ -53,7 +53,7 @@ module CypressRails
 
       res = @checker.request { |http| http.get("/__identify__") }
 
-      return res.body == app.object_id.to_s if res.is_a?(Net::HTTPSuccess) || res.is_a?(Net::HTTPRedirection)
+      res.body == app.object_id.to_s if res.is_a?(Net::HTTPSuccess) || res.is_a?(Net::HTTPRedirection)
     rescue SystemCallError, Net::ReadTimeout, OpenSSL::SSL::SSLError
       false
     end

data/lib/cypress-rails/version.rb

@@ -1,3 +1,3 @@
 module CypressRails
-  VERSION = "0.7.0"
+  VERSION = "0.8.0.rc1"
 end

data/script/test

@@ -6,14 +6,10 @@ set -x
 
 echo "---> Installing dependencies"
 bundle
-cd example
-bundle
-yarn
-cd ..
 
 echo "---> Running tests"
 bundle exec rake
-./script/test_example_app
+BUNDLE_GEMFILE="${1-Gemfile}" ./script/test_example_app
 
 bundle exec rake test
 

data/script/test_example_app

@@ -2,8 +2,6 @@
 
 set -e
 
-directory=$1
-
 cd example
 bundle
 yarn install
@@ -18,4 +16,3 @@ if ! bundle exec rake cypress:run CYPRESS_RAILS_CYPRESS_OPTS="-h" | grep -q "Usa
   echo "Failed to pass options to cypress run"
   exit 1
 fi
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cypress-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0.rc1
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Helps you write Cypress tests of your Rails app