Merge pull request #28586 from mtsmfm/override-driver

Make `driven_by` overridable

2 files changed, 13 insertions, 6 deletions

diff --git a/actionpack/lib/action_dispatch/system_test_case.rb b/actionpack/lib/action_dispatch/system_test_case.rb
index 9cc3d0757f..98fdb36c91 100644
--- a/actionpack/lib/action_dispatch/system_test_case.rb
+++ b/actionpack/lib/action_dispatch/system_test_case.rb
@@ -87,7 +87,7 @@ module ActionDispatch
 
     def initialize(*) # :nodoc:
       super
-      self.class.superclass.driver.use
+      self.class.driver.use
     end
 
     def self.start_application # :nodoc:
@@ -100,6 +100,8 @@ module ActionDispatch
       SystemTesting::Server.new.run
     end
 
+    class_attribute :driver, instance_accessor: false
+
     # System Test configuration options
     #
     # The default settings are Selenium, using Chrome, with a screen size
@@ -113,13 +115,10 @@ module ActionDispatch
     #
     #   driven_by :selenium, screen_size: [800, 800]
     def self.driven_by(driver, using: :chrome, screen_size: [1400, 1400], options: {})
-      @driver = SystemTesting::Driver.new(driver, using: using, screen_size: screen_size, options: options)
+      self.driver = SystemTesting::Driver.new(driver, using: using, screen_size: screen_size, options: options)
     end
 
-    # Returns the driver object for the initialized system test
-    def self.driver
-      @driver ||= SystemTestCase.driven_by(:selenium)
-    end
+    driven_by :selenium
   end
 
   SystemTestCase.start_application
diff --git a/actionpack/test/dispatch/system_testing/system_test_case_test.rb b/actionpack/test/dispatch/system_testing/system_test_case_test.rb
index 1a9421c098..33d98f924f 100644
--- a/actionpack/test/dispatch/system_testing/system_test_case_test.rb
+++ b/actionpack/test/dispatch/system_testing/system_test_case_test.rb
@@ -6,6 +6,14 @@ class SetDriverToRackTestTest < DrivenByRackTest
   end
 end
 
+class OverrideSeleniumSubclassToRackTestTest < DrivenBySeleniumWithChrome
+  driven_by :rack_test
+
+  test "uses rack_test" do
+    assert_equal :rack_test, Capybara.current_driver
+  end
+end
+
 class SetDriverToSeleniumTest < DrivenBySeleniumWithChrome
   test "uses selenium" do
     assert_equal :selenium, Capybara.current_driver