cypress-rails 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08ef4f9087d66f0f04df9831568414e757aae3fb83baf6bfd85c0d7a3509312
-  data.tar.gz: aa4baeebd6d8035ca9b9fc6ba91b0c487e9cf3a385a25ee9da92c96e2fd4ce2c
+  metadata.gz: ff1a69096cba0508c006c7ec8d96796c12026e8ef0e89956eab2af77112a7c96
+  data.tar.gz: ec1076a20ae68ae94359cb35ce81b63b515857eb239fb361da4953d935c400a9
 SHA512:
-  metadata.gz: 15cf818dd04eb1eb89853d2a14839dd54d25ed4c39b21a705fcae507c7cecb12813477913fab43e486a7f80f0bcc4df8cb18cafa0252d3a38c33608b8441c6b7
-  data.tar.gz: 2fa87db917ccc275d14c8dc28f67a55c13a375e13d6a9f25887fc9ad87989d18bb515b2eabab19ef58dcee6da9b098cf1ccabf97ee6a057649468d8f4f740245
+  metadata.gz: a3d7559054e9c3a3d67190294253f7df4994a5d784f25bb4aac2782d65eaa03437d53a612ed9b1559ea405b34e661a1ad9203f1e737253403a9a3d5e512c1680
+  data.tar.gz: 244632d0f95e460ada182b882a0d95cd618264cf10434b337698bbc1c45e9eb40cfa7499b8398b30568ec36a422755228fe2ec9ff36a77bb5608c66d4560ffd5

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 0.9.2
+
+* Fix `rake cypress:init` so it recognizes an existing Cypress config file of
+  any supported extension (`.js`, `.ts`, `.mjs`, `.cjs`, `.mts`, `.cts`)
+  instead of only `cypress.config.js` [#170](https://github.com/testdouble/cypress-rails/issues/170)
+
+## 0.9.1
+
+* Add `CYPRESS_RAILS_SERVER_THREADS` (default: `"0:4"`) to configure the min:max
+  thread count passed to Puma's `Threads:` option, so you can e.g. set it to
+  `"1:1"` for single-threaded mode.
+
 ## 0.9.0
 
 * **[Breaking]** Require Rails 7.1 or newer

data/README.md

@@ -216,6 +216,10 @@ preferred environment variables project-wide using a tool like
   transactional server](#turning-off-the-transactional-server)
 * **CYPRESS_RAILS_CYPRESS_OPTS** (default: _none_) any options you want to
   forward to the Cypress CLI when running its `open` or `run` commands.
+* **CYPRESS_RAILS_SERVER_THREADS** (default: `"0:4"`) the min:max thread count
+  passed to Puma's `Threads:` option when cypress-rails boots its own test
+  server. Set to `"1:1"` for single-threaded mode. This is independent of your
+  app's `config/puma.rb`, which cypress-rails does not read.
 
 #### Example: Running a single spec from the command line
 

data/lib/cypress-rails/config.rb

@@ -2,7 +2,7 @@ require_relative "env"
 
 module CypressRails
   class Config
-    attr_accessor :rails_dir, :cypress_dir, :host, :port, :base_path, :transactional_server, :cypress_cli_opts
+    attr_accessor :rails_dir, :cypress_dir, :host, :port, :base_path, :transactional_server, :cypress_cli_opts, :server_threads
 
     def initialize(
       rails_dir: Env.fetch("CYPRESS_RAILS_DIR", default: Dir.pwd),
@@ -11,7 +11,8 @@ module CypressRails
       port: Env.fetch("CYPRESS_RAILS_PORT"),
       base_path: Env.fetch("CYPRESS_RAILS_BASE_PATH", default: "/"),
       transactional_server: Env.fetch("CYPRESS_RAILS_TRANSACTIONAL_SERVER", type: :boolean, default: true),
-      cypress_cli_opts: Env.fetch("CYPRESS_RAILS_CYPRESS_OPTS", default: "")
+      cypress_cli_opts: Env.fetch("CYPRESS_RAILS_CYPRESS_OPTS", default: ""),
+      server_threads: Env.fetch("CYPRESS_RAILS_SERVER_THREADS", default: "0:4")
     )
       @rails_dir = rails_dir
       @cypress_dir = cypress_dir
@@ -20,6 +21,7 @@ module CypressRails
       @base_path = base_path
       @transactional_server = transactional_server
       @cypress_cli_opts = cypress_cli_opts
+      @server_threads = server_threads
     end
 
     def to_s
@@ -34,6 +36,7 @@ module CypressRails
          CYPRESS_RAILS_BASE_PATH...............#{base_path.inspect}
          CYPRESS_RAILS_TRANSACTIONAL_SERVER....#{transactional_server.inspect}
          CYPRESS_RAILS_CYPRESS_OPTS............#{cypress_cli_opts.inspect}
+         CYPRESS_RAILS_SERVER_THREADS..........#{server_threads.inspect}
 
       DESC
     end

data/lib/cypress-rails/init.rb

@@ -1,5 +1,7 @@
 module CypressRails
   class Init
+    CONFIG_EXTENSIONS = %w[js ts mjs cjs mts cts]
+
     DEFAULT_CONFIG = <<~JS
       const { defineConfig } = require('cypress')
 
@@ -20,12 +22,13 @@ module CypressRails
     JS
 
     def call(cypress_dir = Config.new.cypress_dir)
-      config_path = File.join(cypress_dir, "cypress.config.js")
-      if !File.exist?(config_path)
+      existing_config_path = Dir.glob(File.join(cypress_dir, "cypress.config.{#{CONFIG_EXTENSIONS.join(",")}}")).first
+      if existing_config_path
+        warn "Cypress config already exists in `#{existing_config_path}'. Skipping."
+      else
+        config_path = File.join(cypress_dir, "cypress.config.js")
         File.write(config_path, DEFAULT_CONFIG)
         puts "Cypress config initialized in `#{config_path}'"
-      else
-        warn "Cypress config already exists in `#{config_path}'. Skipping."
       end
     end
   end

data/lib/cypress-rails/launches_cypress.rb

@@ -22,7 +22,8 @@ module CypressRails
       server = @starts_rails_server.call(
         host: config.host,
         port: config.port,
-        transactional_server: config.transactional_server
+        transactional_server: config.transactional_server,
+        server_threads: config.server_threads
       )
       bin = @finds_bin.call(config.cypress_dir)
 

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.config.js"
+desc "Initialize Cypress config"
 task :"cypress:init" do
   system "#{CLI} init"
 end

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

@@ -1,14 +1,12 @@
 module CypressRails
   class Server
     module Puma
-      def self.create(app, port, host)
+      def self.create(app, port, host, threads = "0:4")
         require "rack/handler/puma"
 
         # If we just run the Puma Rack handler it installs signal handlers which prevent us from being able to interrupt tests.
         # Therefore construct and run the Server instance ourselves.
-        # Rack::Handler::Puma.run(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
-        default_options = {Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false}
-        options = default_options # .merge(options)
+        options = {Host: host, Port: port, Threads: threads, workers: 0, daemon: false}
 
         puma_rack_handler = defined?(Rackup::Handler::Puma) ? Rackup::Handler::Puma : Rack::Handler::Puma
         conf = puma_rack_handler.config(app, options)

data/lib/cypress-rails/server.rb

@@ -25,7 +25,8 @@ module CypressRails
       reportable_errors: [Exception],
       extra_middleware: [],
       initializer_hooks: InitializerHooks.instance,
-      puma: Puma)
+      puma: Puma,
+      threads: "0:4")
       @app = app
       @extra_middleware = extra_middleware
       @server_thread = nil # suppress warnings
@@ -37,6 +38,7 @@ module CypressRails
       @checker = Checker.new(@host, @port)
       @initializer_hooks = initializer_hooks
       @puma = puma
+      @threads = threads
     end
 
     def reset_error!
@@ -75,7 +77,7 @@ module CypressRails
         Server.ports[port_key] = port
 
         @server_thread = Thread.new {
-          @puma.create(middleware, port, host)
+          @puma.create(middleware, port, host, @threads)
         }
 
         timer = Timer.new(60)

data/lib/cypress-rails/starts_rails_server.rb

@@ -3,9 +3,9 @@ require_relative "server"
 
 module CypressRails
   class StartsRailsServer
-    def call(host:, port:, transactional_server:)
+    def call(host:, port:, transactional_server:, server_threads:)
       app = create_rack_app(transactional_server)
-      Server.new(app, host: host, port: port).tap do |server|
+      Server.new(app, host: host, port: port, threads: server_threads).tap do |server|
         server.boot
       end
     end

data/lib/cypress-rails/version.rb

@@ -1,3 +1,3 @@
 module CypressRails
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cypress-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Justin Searls