Merge branch 'main' into configuration-via-ruby-and-env-file

Author: orien

.circleci/config.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

.github/workflows/main.yml

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

.standard.yml

@@ -1,5 +1,39 @@
 # CHANGELOG
 
+## 0.5.5
+
+* Add Puma 6 support
+  [#136](https://github.com/testdouble/cypress-rails/pull/136)
+
+## 0.5.4
+
+* Fix Rails 5 support
+  [#126](https://github.com/testdouble/cypress-rails/pull/126)
+
+## 0.5.3
+
+* Fix 2.5 & 2.6 compatibility
+  [#100](https://github.com/testdouble/cypress-rails/issues/100)
+
+## 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))

CHANGELOG.md

@@ -1,94 +1,96 @@
 PATH
   remote: .
   specs:
-    cypress-rails (0.4.2)
+    cypress-rails (0.5.5)
       puma (>= 3.8.0)
       railties (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.0)
-      actionview (= 6.1.0)
-      activesupport (= 6.1.0)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.0)
-      activesupport (= 6.1.0)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.0)
+    activesupport (7.0.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.7)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
-    erubi (1.10.0)
-    i18n (1.8.5)
+    erubi (1.11.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.8.0)
+    loofah (2.19.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.20.1)
-    parser (2.7.2.0)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    nio4r (2.5.8)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    puma (5.1.1)
+    puma (6.0.0)
       nio4r (~> 2.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.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.3)
       loofah (~> 2.3)
-    railties (6.1.0)
-      actionpack (= 6.1.0)
-      activesupport (= 6.1.0)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (2.0.0)
-    rexml (3.2.4)
-    rubocop (1.4.2)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.4.0)
+    rexml (3.2.5)
+    rubocop (1.29.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 1.1.1)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.17.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.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.10.1)
-    standard (0.10.2)
-      rubocop (= 1.4.2)
-      rubocop-performance (= 1.9.1)
-    thor (1.0.1)
-    tzinfo (2.0.4)
+    ruby-progressbar (1.11.0)
+    standard (1.12.1)
+      rubocop (= 1.29.1)
+      rubocop-performance (= 1.13.3)
+    thor (1.2.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   ruby
@@ -101,4 +103,4 @@ DEPENDENCIES
   standard (>= 0.2.0)
 
 BUNDLED WITH
-   2.1.4
+   2.3.13

Gemfile.lock

@@ -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:
@@ -170,7 +168,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
 
@@ -181,6 +179,14 @@ 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
 
 ### before_server_start
@@ -190,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
@@ -215,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
@@ -304,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

README.md

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gem "rails"
+gem "sqlite3"
+gem "puma"
+gem "webpacker"
+gem "bootsnap", require: false
+
+group :development, :test do
+  gem "cypress-rails", path: ".."
+end