cypress-rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562fe8191d39ef805cb9f6ff8cc82f7c1329acc61332425bd23a6c6ff1ccccd2
-  data.tar.gz: 267ac2d8ef9c9969205798acbe5239d398eb35ba93a2a45bedaa18fba8056a60
+  metadata.gz: a89d2ae87c67c2df6c45dd8e3642a9ca52b0f3a88b29b4d7e7569dc22579ff76
+  data.tar.gz: 94d308d83c47086800430e3c8954e068637575f7c4d9e3f4327b1f325600c8dd
 SHA512:
-  metadata.gz: 9b8b12ab6e9f8f565afd72dfc345d717fb8b957ebe6ca4e73f883d9a2f4278eef4ae89335b85e305065114bedbe797e4ba2fb5cdb5b4457ccd93ea9b245f7a51
-  data.tar.gz: 90945b95efc3e0d58651af35d1a13a7740eea905103aa4b8263af380c789f6f0c8a605f58542d8077e26639136ca9f5f0e44ca915b216c8decabd4f2c8e20999
+  metadata.gz: b3630cfd6de6541c551163a34c6e513865743b3733a603a492a4328efd5a827d68925757eba5c0de3d7b095b7597f357f653a52e5040542e8e6c979c869805db
+  data.tar.gz: 0f80be8f0c63d8de21917913b02d83a59d6a436da223c9838b1a0421ca3317bbd5d71289fa60f5021e69d94167453c6b015d4469b61c209e05464449e1bb4034

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,8 +1,15 @@
 # CHANGELOG
 
+## 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 `before_server_start`
+* 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)

data/Gemfile.lock

@@ -1,53 +1,53 @@
 PATH
   remote: .
   specs:
-    cypress-rails (0.5.0)
+    cypress-rails (0.5.1)
       puma (>= 3.8.0)
       railties (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.3.1)
-      actionview (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    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.1.3.1)
-      activesupport (= 6.1.3.1)
+    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.1.3.1)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    ast (2.4.1)
+    ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     erubi (1.10.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.5.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     nio4r (2.5.7)
-    nokogiri (1.11.2)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    puma (5.2.2)
+    puma (5.3.2)
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
@@ -58,38 +58,38 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 0.13)
       thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (2.0.0)
-    rexml (3.2.4)
-    rubocop (1.4.2)
+    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.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.1.1)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.1)
-      rubocop (>= 0.90.0, < 2.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.10.2)
-      rubocop (= 1.4.2)
-      rubocop-performance (= 1.9.1)
+    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 (1.7.0)
+    unicode-display_width (2.0.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -103,4 +103,4 @@ DEPENDENCIES
   standard (>= 0.2.0)
 
 BUNDLED WITH
-   2.2.3
+   2.2.15

data/README.md

@@ -1,6 +1,6 @@
 # cypress-rails
 
-[![CircleCI](https://circleci.com/gh/testdouble/cypress-rails/tree/master.svg?style=svg)](https://circleci.com/gh/testdouble/cypress-rails/tree/master)
+[![CircleCI](https://circleci.com/gh/testdouble/cypress-rails/tree/main.svg?style=svg)](https://circleci.com/gh/testdouble/cypress-rails/tree/main)
 
 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,
@@ -120,7 +120,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:
@@ -170,7 +170,7 @@ 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
 
@@ -228,7 +228,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

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/manages_transactions.rb

@@ -68,7 +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
-      ActiveRecord::TestFixtures.instance_method(:setup_shared_connection_pool).bind(self).call
+      @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/version.rb

@@ -1,3 +1,3 @@
 module CypressRails
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 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.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-07-07 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.2.3
+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
-