Merge pull request rails#42672 from jonathanhefner/system-testing-browser-iff-selenium

Configure browser only when using Selenium

Author: eileencodes

actionpack/lib/action_dispatch/system_testing/driver.rb

@@ -5,13 +5,13 @@ module SystemTesting
     class Driver # :nodoc:
       def initialize(name, **options, &capabilities)
         @name = name
-        @browser = Browser.new(options[:using])
         @screen_size = options[:screen_size]
         @options = options[:options] || {}
         @capabilities = capabilities
 
         if name == :selenium
           require "selenium/webdriver"
+          @browser = Browser.new(options[:using])
           @browser.preload
         end
       end
@@ -28,7 +28,7 @@ def registerable?
         end
 
         def register
-          @browser.configure(&@capabilities)
+          @browser&.configure(&@capabilities)
 
           Capybara.register_driver @name do |app|
             case @name

actionpack/test/dispatch/system_testing/driver_test.rb

@@ -148,13 +148,11 @@ class DriverTest < ActiveSupport::TestCase
     ::Selenium::WebDriver::Chrome::Service.driver_path = original_driver_path
   end
 
-  test "does not preload if used driver is not :selenium" do
-    assert_not_called_on_instance_of(ActionDispatch::SystemTesting::Browser, :preload) do
-      ActionDispatch::SystemTesting::Driver.new(:rack_test, using: :chrome)
-    end
+  test "does not configure browser if driver is not :selenium" do
+    # sanity check
+    assert ActionDispatch::SystemTesting::Driver.new(:selenium).instance_variable_get(:@browser)
 
-    assert_not_called_on_instance_of(ActionDispatch::SystemTesting::Browser, :preload) do
-      ActionDispatch::SystemTesting::Driver.new(:poltergeist)
-    end
+    assert_nil ActionDispatch::SystemTesting::Driver.new(:rack_test).instance_variable_get(:@browser)
+    assert_nil ActionDispatch::SystemTesting::Driver.new(:poltergeist).instance_variable_get(:@browser)
   end
 end