cypress-rails 0.4.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a14e87a5a70d81fe84303607d0927c51766fb088af7ec1939ba73e57319ecc8e
-  data.tar.gz: 4afd968f15e3074ce55d7d24cedaa0362b9542d4661f061debc76fbd8ffa212e
+  metadata.gz: e53dca004e45ff69cd1b4564db925a7a2f90a51a0c6d1fd14474195fd56c4e50
+  data.tar.gz: 3c232334f4f475c57a3b7271f28789cdfcf3cbfcbf9af07ce36dd4d8b1364c5f
 SHA512:
-  metadata.gz: 2fe07821acc26a46e1480caf536d03d69f77e400e53fe28672930ec16ae62e55ddda54d1f296f57f5e1535c75c06c74a6221a3ca87f5cbb239236f3e3b0850dc
-  data.tar.gz: f3a026adf4ec214285eaf2fb004b9984d0bc2f1842495a7a6c6809e6363826ee951de8116380309e105ed887f541412aabe5a9c7980c4f2ce36e555ebcd567ee
+  metadata.gz: 64703f8568b020e2576e9d05a6e622e636ead09298d21850e224a140ae8bc20d5ddc2b7ecd68a42c9b17ebb9c3e174d52f450f92907582df399eb08531e79cf9
+  data.tar.gz: 8540df300675e162107d198c90cf947ee06154291db96799de82b0112cee745274787205da03963dd07e1780c330367367fa42ae7bcc7edece5b27841333186c

data/.github/workflows/main.yml

@@ -0,0 +1,21 @@
+name: CI
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0']
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: ./script/test

data/.standard.yml

@@ -1,4 +1,4 @@
 ignore:
   - 'vendor/bundle/**/*'
-  - 'example/an_app/node_modules/**/*'
-  - 'example/an_app/vendor/bundle/**/*'
+  - 'example/node_modules/**/*'
+  - 'example/vendor/bundle/**/*'

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # CHANGELOG
 
+## 0.5.2
+
+* Fixes a puma deprecation warning
+  [#95](https://github.com/testdouble/cypress-rails/pull/95)
+
+## 0.5.1
+
+* Sprinkles two instance variables to the custom transaction manager that cribs
+  its implementation from ActiveRecord::TestFixtures (see f75f280)
+  [#88](https://github.com/testdouble/cypress-rails/issues/88)
+  [#89](https://github.com/testdouble/cypress-rails/pull/89)
+
+## 0.5.0
+
+* Add hook `after_server_start`
+  [#63](https://github.com/testdouble/cypress-rails/pull/63)
+* Fix namespace bug
+  [#64](https://github.com/testdouble/cypress-rails/pull/64)
+
+## 0.4.2
+
+* Add support to Rails 6.1 ([#52](https://github.com/testdouble/cypress-rails/issue/52))
+
 ## 0.4.1
 
 * Add backcompat for Ruby 2.4

data/Gemfile.lock

@@ -1,97 +1,96 @@
 PATH
   remote: .
   specs:
-    cypress-rails (0.4.1)
+    cypress-rails (0.5.2)
       puma (>= 3.8.0)
       railties (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.4)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.1.4)
+      activesupport (= 6.1.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.3.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    erubi (1.9.0)
-    i18n (1.8.5)
+    erubi (1.10.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.7.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
-    parser (2.7.1.5)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    nio4r (2.5.8)
+    nokogiri (1.12.3)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    puma (5.0.2)
+    puma (5.4.0)
       nio4r (~> 2.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.1)
       loofah (~> 2.3)
-    railties (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.1)
-    rexml (3.2.4)
-    rubocop (0.92.0)
+    rake (13.0.4)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.18.2)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.0)
-      parser (>= 2.7.1.5)
-      strscan (>= 1.0.0)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.3)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.10.1)
-    standard (0.7)
-      rubocop (= 0.92)
-      rubocop-performance (= 1.8.1)
-    strscan (1.0.3)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.0)
+    ruby-progressbar (1.11.0)
+    standard (1.1.4)
+      rubocop (= 1.18.2)
+      rubocop-performance (= 1.11.3)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -104,4 +103,4 @@ DEPENDENCIES
   standard (>= 0.2.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/README.md

@@ -1,7 +1,5 @@
 # cypress-rails
 
-[![CircleCI](https://circleci.com/gh/testdouble/cypress-rails/tree/master.svg?style=svg)](https://circleci.com/gh/testdouble/cypress-rails/tree/master)
-
 This is a simple gem to make it easier to start writing browser tests with
 [Cypress](http://cypress.io) for your [Rails](https://rubyonrails.org) apps,
 regardless of whether your app is server-side rendered HTML, completely
@@ -120,7 +118,7 @@ end
 
 (You can find [an
 example
-initializer](/example/an_app/config/initializers/cypress_rails_initializer.rb)
+initializer](/example/config/initializers/cypress_rails_initializer.rb)
 in this repo.)
 
 The gem also provides a special route on the test server:
@@ -138,9 +136,9 @@ This way, you can easily instruct the server to reset its test state from your
 Cypress tests like so:
 
 ```js
-beforeEach(() =>
+beforeEach(() => {
   cy.request('/cypress_rails_reset_state')
-)
+})
 ```
 
 (Remember, in Cypress, `before` is a before-all hook and `beforeEach` is run
@@ -170,7 +168,24 @@ preferred environment variables project-wide using a tool like
   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_CYPRESS_OPTS** (default: _none_) any options you want to
-  forward to the Cypress CLI when running its `open` or `run` commands
+  forward to the Cypress CLI when running its `open` or `run` commands.
+
+#### Example: Running a single spec from the command line
+
+It's a little verbose, but an example of using the above options to run a single
+Cypress test would look like this:
+
+```
+$ CYPRESS_RAILS_CYPRESS_OPTS="--spec cypress/integration/a_test.js" bin/rake cypress:run
+```
+
+#### Example: Running your tests in Chromium
+
+By default, Cypress will run its tests in its packaged Electron app, unless you've configured it globally. To choose which browser it will run from the command line, try this:
+
+```
+$ CYPRESS_RAILS_CYPRESS_OPTS="--browser chromium" bin/rake cypress:run
+```
 
 ### Initializer hooks
 
@@ -181,6 +196,11 @@ 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
 
+### after_server_start
+
+Pass a block to `CypressRails.hooks.after_server_start` to register a hook that
+will execute after the server has booted.
+
 ### after_transaction_start
 
 If there's any custom behavior or state management you want to do inside the
@@ -206,7 +226,7 @@ of your test database. To set up the hook, pass a block to
 ## Configuring Rails
 
 Beyond the configuration options above, you'll probably also want to disable caching
-in your Rails app's [config/environments/test.rb](/example/an_app/config/environments/test.rb#L9)
+in your Rails app's [config/environments/test.rb](/example/config/environments/test.rb#L9)
 file, so that changes to your Ruby code are reflected in your tests while you
 work on them with `rake cypress:open`. (If either option is set to
 `true`, any changes to your Ruby code will require a server restart to be reflected as you work
@@ -295,7 +315,7 @@ experience. In particular:
   and more information dense than using Capybara and Selenium. Rather than
   running a test from the command line, seeing it fail, then adding a debug
   breakpoint to a test to try to manipulate the browser or tweaking a call to a
-  Capybara API method, failures to be rather obvious when using Cypress and
+  Capybara API method, failures tend to be rather obvious when using Cypress and
   fixing it is usually as easy as tweaking a command, hitting save, and watching
   it re-run
 * With very few exceptions, a Cypress test that works in a browser window will

data/lib/cypress-rails/env.rb

@@ -4,11 +4,8 @@ module CypressRails
       return default unless ENV.key?(name)
 
       if type == :boolean
-        if ["", "0", "n", "no", "false"].include?(ENV.fetch(name))
-          false
-        else
-          true
-        end
+        no_like_flag = ["", "0", "n", "no", "false"].include?(ENV.fetch(name))
+        !no_like_flag
       else
         ENV.fetch(name)
       end

data/lib/cypress-rails/init.rb

@@ -24,7 +24,7 @@ module CypressRails
     end
 
     def merge_existing_with_defaults(json_path)
-      Hash[JSON.parse(File.read(json_path)).merge(DEFAULT_CONFIG).sort]
+      JSON.parse(File.read(json_path)).merge(DEFAULT_CONFIG).sort.to_h
     end
   end
 end

data/lib/cypress-rails/initializer_hooks.rb

@@ -12,6 +12,10 @@ module CypressRails
       register(:before_server_start, blk)
     end
 
+    def after_server_start(&blk)
+      register(:after_server_start, blk)
+    end
+
     def after_transaction_start(&blk)
       register(:after_transaction_start, blk)
     end

data/lib/cypress-rails/manages_transactions.rb

@@ -20,7 +20,7 @@ module CypressRails
 
           begin
             connection = ActiveRecord::Base.connection_handler.retrieve_connection(spec_name)
-          rescue ConnectionNotEstablished
+          rescue ActiveRecord::ConnectionNotEstablished
             connection = nil
           end
 
@@ -68,19 +68,10 @@ module CypressRails
     # 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::Base.respond_to?(:connection_handlers)
-
-      writing_handler = ActiveRecord::Base.connection_handler
-      ActiveRecord::Base.connection_handlers.values.each do |handler|
-        if handler != writing_handler
-          handler.connection_pool_list.each do |pool|
-            name = pool.spec.name
-            writing_connection = writing_handler.retrieve_connection_pool(name)
-            return nil unless writing_connection
-            handler.send(:owner_to_pool)[name] = writing_connection
-          end
-        end
-      end
+      @legacy_saved_pool_configs ||= Hash.new { |hash, key| hash[key] = {} }
+      @saved_pool_configs ||= Hash.new { |hash, key| hash[key] = {} }
+
+      ActiveRecord::TestFixtures.instance_method(:setup_shared_connection_pool).bind_call(self)
     end
   end
 end

data/lib/cypress-rails/server.rb

@@ -3,6 +3,7 @@
 require "uri"
 require "net/http"
 require "rack"
+require_relative "initializer_hooks"
 require_relative "server/middleware"
 require_relative "server/checker"
 require_relative "server/timer"
@@ -32,6 +33,7 @@ module CypressRails
       @port ||= Server.ports[port_key]
       @port ||= find_available_port(host)
       @checker = Checker.new(@host, @port)
+      @initializer_hooks = InitializerHooks.instance
     end
 
     def reset_error!
@@ -78,6 +80,7 @@ module CypressRails
           raise "Rack application timed out during boot" if timer.expired?
 
           @server_thread.join(0.1)
+          @initializer_hooks.run(:after_server_start)
         end
       end
 

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

@@ -11,6 +11,7 @@ module CypressRails
         options = default_options # .merge(options)
 
         conf = Rack::Handler::Puma.config(app, options)
+        conf.clamp
         events = ::Puma::Events.stdio
 
         puma_ver = Gem::Version.new(::Puma::Const::PUMA_VERSION)

data/lib/cypress-rails/version.rb

@@ -1,3 +1,3 @@
 module CypressRails
-  VERSION = "0.4.1"
+  VERSION = "0.5.2"
 end

data/script/test

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+PS4='[script/test:${LINENO}] $ '
+set -euo pipefail
+set -x
+
+echo "---> Installing dependencies"
+bundle
+cd example
+bundle
+yarn
+cd ..
+
+echo "---> Running tests"
+bundle exec rake
+./script/test_example_app
+
+echo "---> Job's done!"
+

data/script/test_example_app

@@ -4,7 +4,7 @@ set -e
 
 directory=$1
 
-cd example/an_app
+cd example
 bundle
 yarn install
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cypress-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -102,7 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".standard.yml"
 - ".travis.yml"
@@ -137,6 +137,7 @@ files:
 - lib/cypress-rails/starts_rails_server.rb
 - lib/cypress-rails/tracks_resets.rb
 - lib/cypress-rails/version.rb
+- script/test
 - script/test_example_app
 homepage: https://github.com/testdouble/cypress-rails
 licenses:
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Helps you write Cypress tests of your Rails app

data/.circleci/config.yml

@@ -1,53 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.6-node-browsers
-    steps:
-      - checkout
-
-      # Bundle install dependencies
-      - type: cache-restore
-        key: v1-main-{{ checksum "Gemfile.lock" }}
-
-      - run: gem install bundler --version `tail -1 Gemfile.lock`
-      - run: bundle install --path vendor/bundle
-
-      - type: cache-save
-        key: v1-main-{{ checksum "Gemfile.lock" }}
-        paths:
-          - vendor/bundle
-
-      # Bundle install dependencies for example app
-      - type: cache-restore
-        key: v1-example-{{ checksum "example/an_app/Gemfile.lock" }}
-
-      - run: |
-          cd example/an_app
-          bundle install --path vendor/bundle
-
-      - type: cache-save
-        key: v1-example-{{ checksum "example/an_app/Gemfile.lock" }}
-        paths:
-          - example/an_app/vendor/bundle
-
-      # Yarn dependencies
-      - restore_cache:
-          keys:
-            - v4-yarn-{{ checksum "example/an_app/yarn.lock" }}
-            # fallback to using the latest cache if no exact match is found
-            - v4-yarn-
-
-      - run: |
-          cd example/an_app
-          yarn install
-
-      - save_cache:
-          paths:
-            - example/an_app/node_modules
-            - ~/.cache
-          key: v4-yarn-{{ checksum "example/an_app/yarn.lock" }}
-
-      - run: bundle exec rake
-      - run: ./script/test_example_app
-