cypress-rails 0.8.0.rc1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 340bff5215842cc3afb419ff29bef8b977e573fdf5311711b4d0badaa05104d1
-  data.tar.gz: c720c43244302da09c9f63f416cba150926c0a6ef4cbf53bc2c418727dd3b87a
+  metadata.gz: c08ef4f9087d66f0f04df9831568414e757aae3fb83baf6bfd85c0d7a3509312
+  data.tar.gz: aa4baeebd6d8035ca9b9fc6ba91b0c487e9cf3a385a25ee9da92c96e2fd4ce2c
 SHA512:
-  metadata.gz: bfb0b42e92ad4e5b576264b18ba035964823cc32b3717979edd127ca14b17f14639cf14083390c27daa1740b0302c0ba9c8b1ba53bb531ca72a03bdd9e9e0798
-  data.tar.gz: 78f57627a4eec8c0ccde58b24b1e6104fe8164e11375a46561a5cf8fbcce12a9536041e60c7be431a7c389a00b3132db679a13b93f49810069e8a6271f255864
+  metadata.gz: 15cf818dd04eb1eb89853d2a14839dd54d25ed4c39b21a705fcae507c7cecb12813477913fab43e486a7f80f0bcc4df8cb18cafa0252d3a38c33608b8441c6b7
+  data.tar.gz: 2fa87db917ccc275d14c8dc28f67a55c13a375e13d6a9f25887fc9ad87989d18bb515b2eabab19ef58dcee6da9b098cf1ccabf97ee6a057649468d8f4f740245

data/.github/workflows/main.yml

@@ -3,24 +3,88 @@ name: CI
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  build:
+  unit-tests:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.3']
-        gemfile: ['Gemfile', 'Gemfile_rails71']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
+
+    steps:
+      - uses: actions/checkout@v7
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          rubygems: latest
+          bundler: latest
+          bundler-cache: true
+
+      - name: Run root unit tests and lint
+        run: |
+          bundle
+          bundle exec rake
+
+  example-app-tests:
+    name: example-app-tests (${{ matrix.ruby-version }}, ${{ matrix.rails-version }}, transactional ${{ matrix.transactional-server }})
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        rails-version: ['7.1', '7.2', '8.0', '8.1']
+        transactional-server: ['true']
         exclude:
-          # Rails 7.2 requires Ruby 3.1+
           - ruby-version: '3.0'
-            gemfile: 'Gemfile'
+            rails-version: '7.2'
+          - ruby-version: '3.0'
+            rails-version: '8.0'
+          - ruby-version: '3.0'
+            rails-version: '8.1'
+          - ruby-version: '3.1'
+            rails-version: '8.0'
+          - ruby-version: '3.1'
+            rails-version: '8.1'
+        include:
+          - ruby-version: '3.4'
+            rails-version: '7.1'
+            transactional-server: 'false'
+          - ruby-version: '3.4'
+            rails-version: '7.2'
+            transactional-server: 'false'
+          - ruby-version: '3.4'
+            rails-version: '8.0'
+            transactional-server: 'false'
+
+    services:
+      postgres:
+        image: postgres:18
+        env:
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/example/gemfiles/rails_${{ matrix.rails-version }}.gemfile
+      CYPRESS_RAILS_TRANSACTIONAL_SERVER: ${{ matrix.transactional-server }}
+      PGHOST: localhost
+      PGUSER: postgres
+      PGPASSWORD: postgres
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+      - uses: actions/setup-node@v7
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
+          cache-version: rails-${{ matrix.rails-version }}
 
-      - name: Run tests
-        run: ./script/test ${{matrix.gemfile}}
+      - name: Run example app Cypress tests
+        run: ./script/test_example_app

data/.gitignore

@@ -6,3 +6,9 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+# Gemfile.lock files are Ruby-version-sensitive (transitive deps can pin
+# versions requiring a newer Ruby than some cells of the CI matrix), so each
+# job resolves and caches its own instead of sharing a committed lock.
+/Gemfile.lock
+/example/gemfiles/*.gemfile.lock

data/CHANGELOG.md

@@ -1,13 +1,46 @@
 # CHANGELOG
 
-## 0.8.0.rc1
-* Add compatibility with Rails 7.2
+## 0.9.0
+
+* **[Breaking]** Require Rails 7.1 or newer
+* **[Breaking]** (relative to 0.8.0) Rename `after_reset_requested` back to
+  `after_state_reset`, and restore the transactional server as the default
+  behavior
+* Bring back the transactional server (and `CYPRESS_RAILS_TRANSACTIONAL_SERVER`),
+  which 0.8.0 had removed. It didn't work reliably to have apps reset their own
+  state under cypress-rails' multi-threaded Puma server
+* `/cypress_rails_reset_state` now resets before responding (returning `200`
+  instead of `202`), rather than deferring the reset to the next request
+
+See [docs/changes-in-0.9.0.md](docs/changes-in-0.9.0.md) for a full comparison
+with both 0.7.1 and 0.8.0.
+
+## 0.8.0
+
+(Avoid this version due to issues with resetting data during threaded requests.
+0.9.0 is almost entirely compatible with 0.7.1 while still bringing Rails 7.2+
+compatibility, so the breaking changes in this version are for nothing.)
+
+* **[Breaking]** Remove `CYPRESS_RAILS_TRANSACTIONAL_SERVER`. cypress-rails no
+  longer wraps the server in a transaction or resets it between tests -
+  automatic Rails-version-specific transaction management proved unsustainable
+  to maintain (see [#164](https://github.com/testdouble/cypress-rails/issues/164),
+  [#161](https://github.com/testdouble/cypress-rails/issues/161)). Apps must
+  now reset their own state (e.g. with `database_cleaner`) using the
+  `after_reset_requested` hook; see the example app for a working setup
+* **[Breaking]** Remove the `after_transaction_start` hook, since cypress-rails
+  no longer manages transactions
+* **[Breaking]** Rename the `after_state_reset` hook to `after_reset_requested`.
+  It now fires whenever a reset was requested (via hitting
+  `/cypress_rails_reset_state`), rather than after cypress-rails had already
+  performed one - the app is expected to perform the reset itself in this hook
+* **[Breaking]** Remove `CypressRails::Config#transactional_server`
+* Add Rails 7.2 / 8.0 support
 
 ## 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
 the cypress tests live outside the CYPRESS_RAILS_DIR [#159](https://github.com/testdouble/cypress-rails/pull/159)
 

data/README.md

@@ -93,6 +93,11 @@ is a JavaScript-based tool and can't easily manipulate your Rails app directly,
 cypress-rails provides a number of hooks that you can use to manage your test
 data.
 
+By default, cypress-rails runs your app inside a database transaction and rolls
+it back between tests, much like a Rails system test. Every thread serving your
+app shares that one transaction, so whatever your tests create is undone on the
+next reset.
+
 Here's what a `config/initializers/cypress_rails.rb` initializer might look
 like:
 
@@ -107,6 +112,10 @@ CypressRails.hooks.after_transaction_start do
   # Called after the transaction is started (at launch and after each reset)
 end
 
+CypressRails.hooks.after_server_start do
+  # Called once, after the server has booted
+end
+
 CypressRails.hooks.after_state_reset do
   # Triggered after `/cypress_rails_reset_state` is called
 end
@@ -122,16 +131,18 @@ initializer](/example/config/initializers/cypress_rails_initializer.rb)
 in this repo.)
 
 The gem also provides a special route on the test server:
-`/cypress_rails_reset_state`. Each time it's called, cypress-rails will do
-two things at the beginning of the next request received by the Rails app:
-
-* If `CYPRESS_RAILS_TRANSACTIONAL_SERVER` is enabled, roll back the transaction,
-effectively resetting the application state to whatever it was at the start of
-the test run
+`/cypress_rails_reset_state`. Each time it's called, cypress-rails does two
+things before responding:
 
+* If `CYPRESS_RAILS_TRANSACTIONAL_SERVER` is enabled, roll back the transaction
+  and start a new one, resetting the database to how it was when the test run
+  started, then trigger any `after_transaction_start` hooks
 * Trigger any `after_state_reset` hooks you've configured (regardless of the
   transactional server setting)
 
+If a hook raises an error, the request fails with a 500 status and the error
+message, so the `cy.request` that triggered the reset fails too.
+
 This way, you can easily instruct the server to reset its test state from your
 Cypress tests like so:
 
@@ -144,6 +155,39 @@ beforeEach(() => {
 (Remember, in Cypress, `before` is a before-all hook and `beforeEach` is run
 between each test case!)
 
+### Turning off the transactional server
+
+The transactional server funnels all of your app's database queries through a
+single connection, one at a time, just like a Rails system test. If your tests
+need your app to access the database concurrently, or your app does work that
+can't happen inside a transaction, set `CYPRESS_RAILS_TRANSACTIONAL_SERVER=false`
+and reset your data yourself in an `after_state_reset` hook. For example, with
+[database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) and
+Rails fixtures:
+
+```ruby
+CypressRails.hooks.after_state_reset do
+  DatabaseCleaner[:active_record].clean_with(:truncation)
+  ActiveRecord::FixtureSet.reset_cache
+  ActiveRecord::FixtureSet.create_fixtures(Rails.root.join("test/fixtures"), ["users", "posts"])
+end
+```
+
+A few things to watch out for:
+
+* Don't use database_cleaner's `:transaction` strategy. It only opens a
+  transaction on one of the server's database connections, so requests served
+  on other connections save their changes for real, and those changes survive
+  the reset. (On SQLite, the open transaction also makes other connections'
+  writes fail with "database is locked" errors.)
+* Don't set `DatabaseCleaner.strategy = ...` at the top of an initializer.
+  Before ActiveRecord has loaded, that assignment is silently ignored and
+  database_cleaner's default `:transaction` strategy is used instead.
+* Truncation removes everything, including data loaded in
+  `before_server_start`, so rebuild whatever your tests need in the hook. Call
+  `ActiveRecord::FixtureSet.reset_cache` before reloading fixtures, or they'll
+  be skipped as already loaded.
+
 ## Configuration
 
 ### Environment variables
@@ -164,10 +208,12 @@ preferred environment variables project-wide using a tool like
   requests to the app (e.g. via `cy.visit()`). If you've customized your
   `baseUrl` setting (e.g. in `cypress.config.js`), you'll need to duplicate it with
   this environment variable
-* **CYPRESS_RAILS_TRANSACTIONAL_SERVER** (default: `true`) when true, will start
-  a transaction on all database connections before launching the server. In
-  general this means anything done during `cypress open` or `cypress run` will
-  be rolled back on exit (similar to running a Rails System test)
+* **CYPRESS_RAILS_TRANSACTIONAL_SERVER** (default: `true`) when true, starts a
+  transaction before launching the server and rolls it back on every reset and
+  on exit, so anything done during `cypress open` or `cypress run` is undone
+  (similar to running a Rails system test). While it's enabled, all of the
+  server's database access shares one connection. See [Turning off the
+  transactional server](#turning-off-the-transactional-server)
 * **CYPRESS_RAILS_CYPRESS_OPTS** (default: _none_) any options you want to
   forward to the Cypress CLI when running its `open` or `run` commands.
 
@@ -194,35 +240,39 @@ $ CYPRESS_RAILS_CYPRESS_OPTS="--browser chromium" bin/rake cypress:run
 
 Pass a block to `CypressRails.hooks.before_server_start` to register a hook that
 will execute before the server or any transaction has been started. If you use
-Rails fixtures, it may make sense to load them here, so they don't need to be
-re-inserted for each request
+Rails fixtures, it may make sense to load them here, so they persist across
+resets instead of being re-inserted each time.
 
 ### after_server_start
 
 Pass a block to `CypressRails.hooks.after_server_start` to register a hook that
-will execute after the server has booted.
+will execute after the server has booted (inside the transaction, if
+`CYPRESS_RAILS_TRANSACTIONAL_SERVER` is enabled).
 
 ### after_transaction_start
 
 If there's any custom behavior or state management you want to do inside the
 transaction (so that it's also rolled back each time a reset is triggered),
-pass a block to `CypressRails.hooks.after_transaction_start`.
+pass a block to `CypressRails.hooks.after_transaction_start`. It runs when the
+server launches and after every reset, and only when
+`CYPRESS_RAILS_TRANSACTIONAL_SERVER` is enabled.
 
 ### after_state_reset
 
 Every time the test server receives an HTTP request at
-`/cypress_rails_reset_state`, the transaction will be rolled back (if
-`CYPRESS_RAILS_TRANSACTIONAL_SERVER` is enabled) and the `after_state_reset`
-hook will be triggered. To set up the hook, pass a block to
-`CypressRails.hooks.after_state_reset`.
+`/cypress_rails_reset_state`, the transaction will be rolled back and restarted
+(if `CYPRESS_RAILS_TRANSACTIONAL_SERVER` is enabled) and then the
+`after_state_reset` hook will be triggered, all before the request responds. To
+set up the hook, pass a block to `CypressRails.hooks.after_state_reset`.
 
 ### before_server_stop
 
 In case you've made any permanent changes to your test database that could
 pollute other test suites or scripts, you can use the `before_server_stop` to
 (assuming everything exits gracefully) clean things up and restore the state
-of your test database. To set up the hook, pass a block to
-`CypressRails.hooks.before_server_stop`.
+of your test database. If `CYPRESS_RAILS_TRANSACTIONAL_SERVER` is enabled, this
+runs after the transaction has been rolled back. To set up the hook, pass a
+block to `CypressRails.hooks.before_server_stop`.
 
 ## Configuring Rails
 

data/cypress-rails.gemspec

@@ -16,17 +16,19 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|example)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|example|docs)/}) }
   end
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "railties", ">= 5.2.0"
+  spec.add_dependency "railties", ">= 7.1"
   spec.add_dependency "puma", ">= 3.8.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "standard", ">= 0.2.0"
+  spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "sqlite3"
 end

data/lib/cypress-rails/launches_cypress.rb

@@ -8,7 +8,6 @@ module CypressRails
   class LaunchesCypress
     def initialize
       @initializer_hooks = InitializerHooks.instance
-      @manages_transactions = ManagesTransactions.instance
       @starts_rails_server = StartsRailsServer.new
       @finds_bin = FindsBin.new
     end
@@ -17,7 +16,8 @@ module CypressRails
       puts config
       @initializer_hooks.run(:before_server_start)
       if config.transactional_server
-        @manages_transactions.begin_transaction
+        ManagesTransactions.instance.begin_transaction
+        @initializer_hooks.run(:after_transaction_start)
       end
       server = @starts_rails_server.call(
         host: config.host,
@@ -53,7 +53,11 @@ module CypressRails
       return if @at_exit_hooks_have_fired
 
       if config.transactional_server
-        @manages_transactions.rollback_transaction
+        begin
+          ManagesTransactions.instance.rollback_transaction
+        rescue => e
+          warn e.full_message
+        end
       end
       @initializer_hooks.run(:before_server_stop)
 

data/lib/cypress-rails/manages_transactions.rb

@@ -1,82 +1,76 @@
-require_relative "initializer_hooks"
-
 module CypressRails
   class ManagesTransactions
     def self.instance
       @instance ||= new
     end
 
-    def begin_transaction
-      @connections = gather_connections
-      @connections.each do |connection|
-        connection.begin_transaction joinable: false, _lazy: false
+    module MinitestLifecycle
+      def before_setup
       end
 
-      # When connections are established in the future, begin a transaction too
-      @connection_subscriber = ActiveSupport::Notifications.subscribe("!connection.active_record") { |_, _, _, _, payload|
-        if payload.key?(:spec_name) && (spec_name = payload[:spec_name])
-          setup_shared_connection_pool
-
-          begin
-            connection = ActiveRecord::Base.connection_handler.retrieve_connection(spec_name)
-          rescue ActiveRecord::ConnectionNotEstablished
-            connection = nil
-          end
+      def after_teardown
+      end
+    end
 
-          if connection && !@connections.include?(connection)
-            connection.begin_transaction joinable: false, _lazy: false
-            @connections << connection
-          end
-        end
-      }
+    def begin_transaction
+      return unless defined?(ActiveRecord::TestFixtures)
 
-      @initializer_hooks.run(:after_transaction_start)
+      # A connection this thread already holds wouldn't be the pinned one
+      release_connections_held_by_this_thread
+      on_owner_thread { fixtures.before_setup }
     end
 
     def rollback_transaction
-      return unless @connections.present?
+      return unless defined?(ActiveRecord::TestFixtures)
 
-      ActiveSupport::Notifications.unsubscribe(@connection_subscriber) if @connection_subscriber
-
-      @connections.each do |connection|
-        connection.rollback_transaction if connection.transaction_open?
+      begin
+        on_owner_thread { fixtures.after_teardown }
+      ensure
+        release_connections_held_by_this_thread
       end
-      @connections.clear
-
-      ActiveRecord::Base.connection_handler.clear_active_connections!
     end
 
     private
 
     def initialize
-      @initializer_hooks = InitializerHooks.instance
+      @jobs = Queue.new
+      # Rails 7.1 keys a pinned connection to the thread that pinned it, and a
+      # Puma thread's end-of-request cleanup would check it back in, so a
+      # dedicated thread that never serves requests owns the transaction.
+      @owner = Thread.new do
+        loop do
+          job, result = @jobs.pop
+          begin
+            result << [:ok, job.call]
+          rescue Exception => e # standard:disable Lint/RescueException
+            result << [:error, e]
+          end
+        end
+      end
     end
 
-    def gather_connections
-      setup_shared_connection_pool
+    def on_owner_thread(&job)
+      result = Queue.new
+      @jobs << [job, result]
+      status, value = result.pop
+      raise value if status == :error
+      value
+    end
 
-      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
+    def release_connections_held_by_this_thread
+      ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
     end
 
-    # Shares the writing connection pool with connections on
-    # other handlers.
-    #
-    # In an application with a primary and replica the test fixtures
-    # need to share a connection pool so that the reading connection
-    # can see data in the open transaction on the writing connection.
-    def setup_shared_connection_pool
-      return unless ActiveRecord::TestFixtures.respond_to?(:setup_shared_connection_pool)
-      @legacy_saved_pool_configs ||= Hash.new { |hash, key| hash[key] = {} }
-      @saved_pool_configs ||= Hash.new { |hash, key| hash[key] = {} }
+    def fixtures
+      @fixtures ||= Class.new {
+        # Must be included before TestFixtures, or its hooks never run
+        include MinitestLifecycle
+        include ActiveRecord::TestFixtures
 
-      ActiveRecord::TestFixtures.instance_method(:setup_shared_connection_pool).bind(self).call
+        def name
+          "cypress-rails"
+        end
+      }.new
     end
   end
 end

data/lib/cypress-rails/resets_state.rb

@@ -1,20 +1,43 @@
 require_relative "config"
-require_relative "manages_transactions"
 require_relative "initializer_hooks"
+require_relative "manages_transactions"
 
 module CypressRails
   class ResetsState
-    def initialize
-      @manages_transactions = ManagesTransactions.instance
-      @initializer_hooks = InitializerHooks.instance
+    LOCK = Mutex.new
+
+    def initialize(
+      transactional_server:,
+      manages_transactions: nil,
+      initializer_hooks: InitializerHooks.instance,
+      wrap: ->(&block) { Rails.application.reloader.wrap(&block) }
+    )
+      @transactional_server = transactional_server
+      @manages_transactions = manages_transactions
+      @initializer_hooks = initializer_hooks
+      @wrap = wrap
     end
 
-    def call(transactional_server:)
-      if transactional_server
-        @manages_transactions.rollback_transaction
-        @manages_transactions.begin_transaction
+    def call
+      LOCK.synchronize do
+        if @transactional_server
+          # Outside the reloader: waiting on the owner thread while holding a
+          # reloader share could deadlock against a code reload
+          manages_transactions.rollback_transaction
+          manages_transactions.begin_transaction
+        end
+
+        @wrap.call do
+          @initializer_hooks.run(:after_transaction_start) if @transactional_server
+          @initializer_hooks.run(:after_state_reset)
+        end
       end
-      @initializer_hooks.run(:after_state_reset)
+    end
+
+    private
+
+    def manages_transactions
+      @manages_transactions ||= ManagesTransactions.instance
     end
   end
 end

data/lib/cypress-rails/server.rb

@@ -23,7 +23,9 @@ module CypressRails
       host:,
       port:,
       reportable_errors: [Exception],
-      extra_middleware: [])
+      extra_middleware: [],
+      initializer_hooks: InitializerHooks.instance,
+      puma: Puma)
       @app = app
       @extra_middleware = extra_middleware
       @server_thread = nil # suppress warnings
@@ -33,7 +35,8 @@ module CypressRails
       @port ||= Server.ports[port_key]
       @port ||= find_available_port(host)
       @checker = Checker.new(@host, @port)
-      @initializer_hooks = InitializerHooks.instance
+      @initializer_hooks = initializer_hooks
+      @puma = puma
     end
 
     def reset_error!
@@ -72,7 +75,7 @@ module CypressRails
         Server.ports[port_key] = port
 
         @server_thread = Thread.new {
-          Puma.create(middleware, port, host)
+          @puma.create(middleware, port, host)
         }
 
         timer = Timer.new(60)
@@ -80,8 +83,10 @@ module CypressRails
           raise "Rack application timed out during boot" if timer.expired?
 
           @server_thread.join(0.1)
-          @initializer_hooks.run(:after_server_start)
         end
+
+        # Once the server is up, so slow hooks don't count against the timeout
+        @initializer_hooks.run(:after_server_start)
       end
 
       self

data/lib/cypress-rails/starts_rails_server.rb

@@ -1,28 +1,26 @@
-require_relative "tracks_resets"
+require_relative "resets_state"
 require_relative "server"
 
 module CypressRails
   class StartsRailsServer
     def call(host:, port:, transactional_server:)
-      configure_rails_to_run_our_state_reset_on_every_request!(transactional_server)
-      app = create_rack_app
+      app = create_rack_app(transactional_server)
       Server.new(app, host: host, port: port).tap do |server|
         server.boot
       end
     end
 
-    def configure_rails_to_run_our_state_reset_on_every_request!(transactional_server)
-      Rails.application.executor.to_run do
-        TracksResets.instance.reset_state_if_needed(transactional_server)
-      end
-    end
-
-    def create_rack_app
+    def create_rack_app(transactional_server)
       Rack::Builder.new do
         map "/cypress_rails_reset_state" do
           run lambda { |env|
-            TracksResets.instance.reset_needed!
-            [202, {"Content-Type" => "text/plain"}, ["Accepted"]]
+            begin
+              ResetsState.new(transactional_server: transactional_server).call
+              [200, {"content-type" => "text/plain"}, ["Reset"]]
+            rescue => e
+              warn e.full_message
+              [500, {"content-type" => "text/plain"}, ["#{e.class}: #{e.message}"]]
+            end
           }
         end
         map "/" do

data/lib/cypress-rails/version.rb

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

data/script/test

@@ -6,12 +6,20 @@ set -x
 
 echo "---> Installing dependencies"
 bundle
+cd example
+bundle
+yarn
+cd ..
 
-echo "---> Running tests"
+echo "---> Running root tests"
 bundle exec rake
-BUNDLE_GEMFILE="${1-Gemfile}" ./script/test_example_app
 
-bundle exec rake test
+for gemfile in example/gemfiles/*.gemfile; do
+  echo "---> Running example app tests against $gemfile"
+  export BUNDLE_GEMFILE="$PWD/$gemfile"
+  (cd example && bundle) # ensure that gemfile's lockfile is installed
+  ./script/test_example_app
+  unset BUNDLE_GEMFILE
+done
 
 echo "---> Job's done!"
-

data/script/test_example_app

@@ -2,6 +2,8 @@
 
 set -e
 
+directory=$1
+
 cd example
 bundle
 yarn install
@@ -16,3 +18,4 @@ 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,13 @@
 --- !ruby/object:Gem::Specification
 name: cypress-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0.rc1
+  version: 0.9.0
 platform: ruby
 authors:
 - Justin Searls
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +93,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-description:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - searls@gmail.com
 executables:
@@ -108,7 +134,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -135,7 +160,6 @@ files:
 - lib/cypress-rails/server/puma.rb
 - lib/cypress-rails/server/timer.rb
 - lib/cypress-rails/starts_rails_server.rb
-- lib/cypress-rails/tracks_resets.rb
 - lib/cypress-rails/version.rb
 - script/test
 - script/test_example_app
@@ -144,7 +168,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Helps you write Cypress tests of your Rails app
 test_files: []

data/Gemfile.lock

@@ -1,153 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cypress-rails (0.8.0.rc1)
-      puma (>= 3.8.0)
-      railties (>= 5.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (7.1.3)
-      actionview (= 7.1.3)
-      activesupport (= 7.1.3)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3)
-      activesupport (= 7.1.3)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.6)
-    builder (3.2.4)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    crass (1.0.6)
-    drb (2.2.0)
-      ruby2_keywords
-    erubi (1.12.0)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    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)
-    minitest (5.22.2)
-    mutex_m (0.2.0)
-    nio4r (2.7.0)
-    nokogiri (1.16.2)
-      racc (~> 1.4)
-    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.1.7)
-    rack-session (2.0.0)
-      rack (>= 3.0.0)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rackup (2.1.0)
-      rack (>= 3)
-      webrick (~> 1.8)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
-      irb
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rainbow (3.1.1)
-    rake (13.1.0)
-    rdoc (6.6.3.1)
-      psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.5.7)
-      io-console (~> 0.5)
-    rexml (3.2.6)
-    rubocop (1.59.0)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      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.30.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      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.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.5.0)
-    webrick (1.8.1)
-    zeitwerk (2.6.13)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  cypress-rails!
-  minitest (~> 5.0)
-  rake (~> 13.0)
-  standard (>= 0.2.0)
-
-BUNDLED WITH
-   2.3.13

data/lib/cypress-rails/tracks_resets.rb

@@ -1,26 +0,0 @@
-require_relative "resets_state"
-
-module CypressRails
-  class TracksResets
-    def self.instance
-      @instance ||= new
-    end
-
-    def reset_needed!
-      @reset_needed = true
-    end
-
-    def reset_state_if_needed(transactional_server)
-      if @reset_needed
-        ResetsState.new.call(transactional_server: transactional_server)
-        @reset_needed = false
-      end
-    end
-
-    private
-
-    def initialize
-      @reset_needed = false
-    end
-  end
-end