e2e 0.7.0 → 0.7.2

data/lib/e2e/server.rb

@@ -17,24 +17,44 @@ module E2E
 
     def start
       @thread = Thread.new do
-        # Use Rackup handler for Rack 3 compatibility
-        Rackup::Handler::WEBrick.run(
+        webrick_handler.run(
           @app,
           Host: @host,
           Port: @port,
           AccessLog: [],
           Logger: WEBrick::Log.new(nil, 0) # Silence logs
-        )
+        ) do |server|
+          @webrick = server
+        end
       end
       wait_for_boot
     end
 
+    def stop
+      @webrick&.shutdown
+      @thread&.join(5)
+      @thread = nil
+      @webrick = nil
+    end
+
     def base_url
       "http://#{@host}:#{@port}"
     end
 
     private
 
+    # rackup 2.x (the version paired with Rack 3) exposes Rackup::Handler.
+    # Older stacks that pin Rack 2.x (e.g. Rails 7.0/7.1 via this gem's own
+    # Appraisal matrix) resolve `rackup` down to its 1.x line, which has no
+    # Handler module at all -- there, the handler lives on Rack::Handler.
+    def webrick_handler
+      if defined?(Rackup::Handler)
+        Rackup::Handler.get(:webrick)
+      else
+        Rack::Handler.get(:webrick)
+      end
+    end
+
     def find_available_port
       server = TCPServer.new("127.0.0.1", 0)
       port = server.addr[1]
@@ -45,6 +65,11 @@ module E2E
     def wait_for_boot
       start_time = Time.now
       loop do
+        if @thread && !@thread.alive?
+          @thread.join # re-raises whatever exception killed the server thread
+          raise "Server thread exited before boot completed"
+        end
+
         socket = TCPSocket.new("127.0.0.1", @port)
         socket.close
         break

data/lib/e2e/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module E2E
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
 end

data/lib/e2e/vite_assets.rb

@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "pathname"
+
+module E2E
+  # Ensures ViteRuby test assets are built before the e2e suite runs.
+  #
+  # ViteRuby::Builder skips compile when the watched-files digest is unchanged,
+  # so calling this on every suite start is cheap when assets are fresh.
+  #
+  # A flock serializes builders across processes (e.g. accidental parallel e2e).
+  module ViteAssets
+    LOCK_NAME = "e2e-vite-test-build.lock"
+    SKIP_ENV = "SKIP_VITE_TEST_BUILD"
+
+    class << self
+      def ensure_built!
+        return if ENV[SKIP_ENV] == "1"
+        return if done?
+
+        mode = normalize_mode(E2E.config.ensure_vite_assets)
+        return mark_done! if mode == :skip
+
+        with_lock do
+          return if done?
+
+          case mode
+          when :auto
+            ensure_auto!
+          when :build
+            ensure_required!
+          when :warn
+            ensure_warn!
+          end
+
+          mark_done!
+        end
+      end
+
+      def reset!
+        @done = false
+      end
+
+      def project_root
+        if defined?(Rails) && Rails.respond_to?(:root) && Rails.root
+          Pathname(Rails.root)
+        else
+          Pathname.pwd
+        end
+      end
+
+      private
+
+      def done?
+        @done
+      end
+
+      def mark_done!
+        @done = true
+      end
+
+      def normalize_mode(value)
+        case value
+        when :auto, :build, :warn, :skip then value
+        when true then :build
+        when false, nil then :skip
+        else
+          raise E2E::Error, "Unknown ensure_vite_assets=#{value.inspect} (expected :auto, :build, :warn, :skip)"
+        end
+      end
+
+      def vite_ruby_loaded?
+        defined?(ViteRuby)
+      end
+
+      def ensure_auto!
+        return unless vite_ruby_loaded?
+
+        build_or_raise!
+      end
+
+      def ensure_required!
+        unless vite_ruby_loaded?
+          raise E2E::Error, <<~MSG.chomp
+            ViteRuby is not loaded, but E2E.config.ensure_vite_assets = :build.
+            Add vite_rails / vite_ruby, or set ensure_vite_assets to :skip / :auto.
+          MSG
+        end
+
+        build_or_raise!
+      end
+
+      def ensure_warn!
+        return warn_missing_vite_ruby unless vite_ruby_loaded?
+
+        return if ViteRuby.commands.build
+
+        warn <<~MSG
+          [E2E] Vite test asset build failed.
+          Run: bin/vite build --mode=test
+          Or set #{SKIP_ENV}=1 / E2E.config.ensure_vite_assets = :skip
+        MSG
+      end
+
+      def warn_missing_vite_ruby
+        warn "[E2E] ensure_vite_assets=:warn but ViteRuby is not loaded; skipping."
+      end
+
+      def build_or_raise!
+        return if ViteRuby.commands.build
+
+        raise E2E::Error, <<~MSG.chomp
+          Vite test asset build failed.
+          Run: bin/vite build --mode=test
+          Or set #{SKIP_ENV}=1 to skip (not recommended for Inertia/Vite apps).
+        MSG
+      end
+
+      def with_lock
+        lock_path = project_root.join("tmp", LOCK_NAME)
+        FileUtils.mkdir_p(lock_path.dirname)
+
+        File.open(lock_path, File::RDWR | File::CREAT, 0o644) do |lock|
+          lock.flock(File::LOCK_EX)
+          yield
+        ensure
+          lock.flock(File::LOCK_UN)
+        end
+      end
+    end
+  end
+end

data/lib/e2e.rb

@@ -7,6 +7,7 @@ require_relative "e2e/session"
 require_relative "e2e/dsl"
 require_relative "e2e/element"
 require_relative "e2e/rails"
+require_relative "e2e/vite_assets"
 require_relative "e2e/drivers/playwright"
 
 module E2E
@@ -37,6 +38,11 @@ module E2E
         srv
       end
     end
+
+    def stop_server!
+      @server&.stop
+      @server = nil
+    end
   end
 
   # Retry a block until it returns truthy or timeout is reached
@@ -61,7 +67,8 @@ module E2E
       alert: "[role='alert'], [data-flash-type='alert'], [data-flash='alert'], .flash.alert, .flash-error, .alert"
     }.freeze
 
-    attr_accessor :driver, :headless, :app, :browser_type, :wait_timeout, :flash_selectors
+    attr_accessor :driver, :headless, :app, :browser_type, :wait_timeout, :flash_selectors,
+      :navigation_timeout, :navigation_wait_until, :ensure_vite_assets
 
     def initialize
       @driver = :playwright
@@ -69,7 +76,13 @@ module E2E
       @headless = ENV.fetch("HEADLESS", "true") == "true"
       @app = nil
       @wait_timeout = 5
+      # Full "load" waits for every subframe (YouTube/Vimeo/etc.) and can hang
+      # navigations indefinitely when those resources never settle.
+      @navigation_wait_until = "domcontentloaded"
+      @navigation_timeout = 30
       @flash_selectors = DEFAULT_FLASH_SELECTORS.dup
+      # :auto builds when ViteRuby is loaded; :build requires it; :warn / :skip
+      @ensure_vite_assets = :auto
     end
   end
 end

data/lib/generators/e2e/install_generator.rb

@@ -68,6 +68,9 @@ module E2e
           E2E.configure do |config|
             config.app = Rails.application
             config.headless = ENV.fetch("HEADLESS", "true") == "true"
+            # :auto builds Vite test assets when ViteRuby is loaded (Inertia/Vite apps).
+            # Options: :auto, :build, :warn, :skip — or SKIP_VITE_TEST_BUILD=1
+            config.ensure_vite_assets = :auto
           end
 
           # If you want to use transactional tests (faster), enable shared connection:
@@ -89,6 +92,9 @@ module E2e
           E2E.configure do |config|
             config.app = Rails.application
             config.headless = ENV.fetch("HEADLESS", "true") == "true"
+            # :auto builds Vite test assets when ViteRuby is loaded (Inertia/Vite apps).
+            # Options: :auto, :build, :warn, :skip — or SKIP_VITE_TEST_BUILD=1
+            config.ensure_vite_assets = :auto
           end
 
           # If you want to use transactional tests (faster), enable shared connection:

data/mise.toml

@@ -0,0 +1,14 @@
+[tools]
+ruby = "4.0.6"
+
+[tasks.test]
+description = "Run RSpec and Minitest suites"
+run = "bundle exec rake spec test"
+
+[tasks.lint]
+description = "Run RuboCop"
+run = "bundle exec rubocop"
+
+[tasks.release]
+description = "Build and publish the gem (rake release)"
+run = "bundle exec rake release"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: e2e
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Alexey Poimtsev
@@ -65,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +191,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +227,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ruby-version"
 - Appraisals
 - CHANGELOG.md
 - LICENSE.txt
@@ -229,10 +258,12 @@ files:
 - lib/e2e/server.rb
 - lib/e2e/session.rb
 - lib/e2e/version.rb
+- lib/e2e/vite_assets.rb
 - lib/generators/e2e/install_generator.rb
 - lib/generators/e2e/templates/minitest_test.rb.erb
 - lib/generators/e2e/templates/rspec_test.rb.erb
 - lib/generators/e2e/test_generator.rb
+- mise.toml
 - sig/e2e.rbs
 homepage: https://github.com/alec-c4/e2e
 licenses:
@@ -255,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Unified E2E testing framework for Ruby.
 test_files: []