cypress-rails 0.5.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efaf85898e684adf953cc9951a47fd6c97dde338cb0b5719ed6686dcb7b2b19b
-  data.tar.gz: 3685cd5e6be4e515c65da1c4b756e8847ead9899936fd0925b97145332b7b977
+  metadata.gz: 24eb8b9afcb78821b2291a9f649aa23289be2de7b7e301aa04bbc521af73f5d6
+  data.tar.gz: 76d178ce43355d9072d400101bf7e2166e84124e20e406b785b1d3983a5c7f5e
 SHA512:
-  metadata.gz: '088fbf9e266da8d373d4e8f2b70635dc80956bc38a22c28b74555ed0e5ecf0774188bcf9e35f4d612dbdb4ea94f7c904da82b06c21162a9390edccde254328d4'
-  data.tar.gz: 327e0a512b34dfa1157465b77d42a4150cf54d2a93e03ef1f342b388bb5e0dfd9a95d9b30a1b707d3ac819c113d0c9a3cd84f612e71b4e4d55b3d3aced211b8a
+  metadata.gz: de8f996a5e27aa4788c5fcf496b6c48d486261b343bb914ed0a55399c1560499642cf9413faa39bad17db08cb29fda94d91ecb4ec03539ae7a495380ef8d4d2b
+  data.tar.gz: c12bdc03096784182c2aa048e96386e8ce3ca8742eed24d1c1b0a0dcbcf438270f53a1d07d721d17eee85d9b950633d705760a519a7441811a9c5f6a0da23529

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## 0.6.1
+
+* Fix a deprecation warning in Rails
+  [#157](https://github.com/testdouble/cypress-rails/pull/157)
+
+## 0.6.0
+
+* Update initializer task to generate valid Cypress v10+ configurations
+  [#156](https://github.com/testdouble/cypress-rails/pull/156)
+
+## 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

data/Gemfile.lock

@@ -1,96 +1,98 @@
 PATH
   remote: .
   specs:
-    cypress-rails (0.5.3)
+    cypress-rails (0.6.1)
       puma (>= 3.8.0)
       railties (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.6)
+      actionview (= 7.0.6)
+      activesupport (= 7.0.6)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (7.0.6)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.4.1)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       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.9)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    erubi (1.10.0)
-    i18n (1.8.10)
+    erubi (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    nio4r (2.5.8)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    mini_portile2 (2.8.2)
+    minitest (5.15.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    puma (5.4.0)
+    puma (6.3.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)
+    racc (1.7.1)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.4)
-    regexp_parser (2.1.1)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.4.0)
     rexml (3.2.5)
-    rubocop (1.18.2)
+    rubocop (1.29.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.3)
+    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)
-    standard (1.1.4)
-      rubocop (= 1.18.2)
-      rubocop-performance (= 1.11.3)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    standard (1.12.1)
+      rubocop (= 1.29.1)
+      rubocop-performance (= 1.13.3)
+    thor (1.2.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -103,4 +105,4 @@ DEPENDENCIES
   standard (>= 0.2.0)
 
 BUNDLED WITH
-   2.2.15
+   2.3.13

data/README.md

@@ -50,7 +50,7 @@ Once installed, you'll want to run:
 $ rake cypress:init
 ```
 
-This will override a few configurations in your `cypress.json` configuration
+This will override a few configurations in your `cypress.config.js` configuration
 file.
 
 ## Usage
@@ -161,7 +161,7 @@ preferred environment variables project-wide using a tool like
   the Rails test server on
 * **CYPRESS_RAILS_BASE_PATH** (default: `"/"`) the base path for all Cypress's
   requests to the app (e.g. via `cy.visit()`). If you've customized your
-  `baseUrl` setting (e.g. in `cypress.json`), you'll need to duplicate it with
+  `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

data/cypress-rails.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Helps you write Cypress tests of your Rails app"
   spec.homepage = "https://github.com/testdouble/cypress-rails"
   spec.license = "MIT"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   # 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.

data/lib/cypress-rails/init.rb

@@ -1,30 +1,32 @@
 module CypressRails
   class Init
-    DEFAULT_CONFIG = {
-      "screenshotsFolder" => "tmp/cypress_screenshots",
-      "videosFolder" => "tmp/cypress_videos",
-      "trashAssetsBeforeRuns" => false
-    }
+    DEFAULT_CONFIG = <<~JS
+      const { defineConfig } = require('cypress')
 
-    def call(dir = Dir.pwd)
-      config_path = File.join(dir, "cypress.json")
-      json = JSON.pretty_generate(determine_new_config(config_path))
-      File.write(config_path, json)
-      puts "Cypress config (re)initialized in #{config_path}"
-    end
-
-    private
+      module.exports = defineConfig({
+        // setupNodeEvents can be defined in either
+        // the e2e or component configuration
+        e2e: {
+          setupNodeEvents(on, config) {
+            on('before:browser:launch', (browser = {}, launchOptions) => {
+              /* ... */
+            })
+          },
+        },
+        screenshotsFolder: "tmp/cypress_screenshots",
+        videosFolder: "tmp/cypress_videos",
+        trashAssetsBeforeRuns: false
+      })
+    JS
 
-    def determine_new_config(config_path)
-      if File.exist?(config_path)
-        merge_existing_with_defaults(config_path)
+    def call(dir = Dir.pwd)
+      config_path = File.join(dir, "cypress.config.js")
+      if !File.exist?(config_path)
+        File.write(config_path, DEFAULT_CONFIG)
+        puts "Cypress config initialized in `#{config_path}'"
       else
-        DEFAULT_CONFIG
+        warn "Cypress config already exists in `#{config_path}'. Skipping."
       end
     end
-
-    def merge_existing_with_defaults(json_path)
-      JSON.parse(File.read(json_path)).merge(DEFAULT_CONFIG).sort.to_h
-    end
   end
 end

data/lib/cypress-rails/manages_transactions.rb

@@ -46,7 +46,7 @@ module CypressRails
       end
       @connections.clear
 
-      ActiveRecord::Base.clear_active_connections!
+      ActiveRecord::Base.connection_handler.clear_active_connections!
     end
 
     private
@@ -68,6 +68,7 @@ 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::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] = {} }
 

data/lib/cypress-rails/rake.rb

@@ -1,7 +1,7 @@
 require "pathname"
 CLI = Pathname.new(File.dirname(__FILE__)).join("../../exe/cypress-rails")
 
-desc "Initialize cypress.json"
+desc "Initialize cypress.config.js"
 task :"cypress:init" do
   system "#{CLI} init"
 end

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

@@ -12,18 +12,18 @@ module CypressRails
 
         conf = Rack::Handler::Puma.config(app, options)
         conf.clamp
-        events = ::Puma::Events.stdio
+        logger = (defined?(::Puma::LogWriter) ? ::Puma::LogWriter : ::Puma::Events).stdio
 
         puma_ver = Gem::Version.new(::Puma::Const::PUMA_VERSION)
         require_relative "patches/puma_ssl" if (Gem::Version.new("4.0.0")...Gem::Version.new("4.1.0")).cover? puma_ver
 
-        events.log "Starting Puma..."
-        events.log "* Version #{::Puma::Const::PUMA_VERSION} , codename: #{::Puma::Const::CODE_NAME}"
-        events.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
+        logger.log "Starting Puma..."
+        logger.log "* Version #{::Puma::Const::PUMA_VERSION} , codename: #{::Puma::Const::CODE_NAME}"
+        logger.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
 
-        ::Puma::Server.new(conf.app, events, conf.options).tap do |s|
-          s.binder.parse conf.options[:binds], s.events
-          s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads]
+        ::Puma::Server.new(conf.app, defined?(::Puma::LogWriter) ? nil : logger, conf.options).tap do |s|
+          s.binder.parse conf.options[:binds], s.respond_to?(:log_writer) ? s.log_writer : s.events
+          s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads] if s.respond_to?(:min_threads=)
         end.run.join
       end
     end

data/lib/cypress-rails/version.rb

@@ -1,3 +1,3 @@
 module CypressRails
-  VERSION = "0.5.3"
+  VERSION = "0.6.1"
 end

data/script/test_example_app

@@ -10,6 +10,7 @@ yarn install
 
 # test a normal test run
 bundle exec rake db:test:prepare
+NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=test bundle exec rake assets:precompile
 bundle exec rake cypress:run
 
 # test that passing options works (by printing help)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cypress-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -142,7 +142,8 @@ files:
 homepage: https://github.com/testdouble/cypress-rails
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Helps you write Cypress tests of your Rails app