cypress-rails 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0088a9590b5bc5e26f46712eab77a85be92e01cea16722a0945463261a2e517b'
-  data.tar.gz: eb19c0b7022aaea43ead4557247f47b11a8e3d1e90c6f0ce518dd0dadfe811da
+  metadata.gz: 51850b1aa42e0669b0f94e97f73b7f9f6858ab04c6290645c29c556c5b6ccc9e
+  data.tar.gz: edade573f72bf936fe1489872bcbcd0ed824c8c04b4b56728260402f551e2e88
 SHA512:
-  metadata.gz: be4b582a6f013139ca8599ba08a2ee2b4c6c8f17c8a05d6fa62276bb4f52730959495e3004f635612cb3ac5c2a93d1f30a7a0ce2b09cd9659793aeaef03e22ea
-  data.tar.gz: eadd7f6340cd5f8596cf9abfadf8a758f26893af6c01501100ac361bf067b842d4afdd8b617fef18e83b73643b5aa6d22c5ba47711985a66af601fd34dd39893
+  metadata.gz: 81c23646df18000812108410396a1b65eb3bbd8300ecdd00a37f3aca789ac567e465634690ae4a902ff6bc6baa4616782f8af5071a2ccb6379bbc3f785908c5f
+  data.tar.gz: 7848d68edac62c1ddb86e779b22b3eda78c1ca350661e6a95433e364ffcdbb7e708f09a88334edfafebe23f7a569f1958e39b535a264fa2b80633e0afd0e7322

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 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

data/Gemfile.lock

@@ -1,65 +1,66 @@
 PATH
   remote: .
   specs:
-    cypress-rails (0.5.4)
+    cypress-rails (0.6.0)
       puma (>= 3.8.0)
       railties (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.3)
-      actionview (= 7.0.3)
-      activesupport (= 7.0.3)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
+      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 (7.0.3)
-      activesupport (= 7.0.3)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.3)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    erubi (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.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.8.0)
+    mini_portile2 (2.8.2)
     minitest (5.15.0)
-    nio4r (2.5.8)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    puma (5.6.4)
+    puma (6.3.0)
       nio4r (~> 2.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (7.0.3)
-      actionpack (= 7.0.3)
-      activesupport (= 7.0.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -86,11 +87,11 @@ GEM
     standard (1.12.1)
       rubocop (= 1.29.1)
       rubocop-performance (= 1.13.3)
-    thor (1.2.1)
-    tzinfo (2.0.4)
+    thor (1.2.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby

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/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.4"
+  VERSION = "0.6.0"
 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.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2023-06-05 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.3.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Helps you write Cypress tests of your Rails app