Merge pull request #28341 from mtsmfm/pass-options-to-driven-by

Pass options to `driven_by`
rails · Mar 17, 2017 · 7413be0 · 7413be0
2 parents 3666962 + ec99107
commit 7413be0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/actionpack/lib/action_dispatch/system_test_case.rb b/actionpack/lib/action_dispatch/system_test_case.rb
@@ -112,8 +112,8 @@ def self.start_application # :nodoc:
     #   driven_by :selenium, using: :firefox
     #
     #   driven_by :selenium, screen_size: [800, 800]
-    def self.driven_by(driver, using: :chrome, screen_size: [1400, 1400])
-      @driver = SystemTesting::Driver.new(driver, using: using, screen_size: screen_size)
+    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)
     end
 
     # Returns the driver object for the initialized system test

diff --git a/actionpack/lib/action_dispatch/system_testing/driver.rb b/actionpack/lib/action_dispatch/system_testing/driver.rb
@@ -5,6 +5,7 @@ def initialize(name, **options)
         @name = name
         @browser = options[:using]
         @screen_size = options[:screen_size]
+        @options = options[:options]
       end
 
       def use
@@ -19,7 +20,7 @@ def selenium?
 
         def register
           Capybara.register_driver @name do |app|
-            Capybara::Selenium::Driver.new(app, browser: @browser).tap do |driver|
+            Capybara::Selenium::Driver.new(app, { browser: @browser }.merge(@options)).tap do |driver|
               driver.browser.manage.window.size = Selenium::WebDriver::Dimension.new(*@screen_size)
             end
           end

diff --git a/actionpack/test/dispatch/system_testing/driver_test.rb b/actionpack/test/dispatch/system_testing/driver_test.rb
@@ -8,10 +8,11 @@ class DriverTest < ActiveSupport::TestCase
   end
 
   test "initializing the driver with a browser" do
-    driver = ActionDispatch::SystemTesting::Driver.new(:selenium, using: :chrome, screen_size: [1400, 1400])
+    driver = ActionDispatch::SystemTesting::Driver.new(:selenium, using: :chrome, screen_size: [1400, 1400], options: { url: "http://example.com/wd/hub" })
     assert_equal :selenium, driver.instance_variable_get(:@name)
     assert_equal :chrome, driver.instance_variable_get(:@browser)
     assert_equal [1400, 1400], driver.instance_variable_get(:@screen_size)
+    assert_equal ({ url: "http://example.com/wd/hub" }), driver.instance_variable_get(:@options)
   end
 
   test "selenium? returns false if driver is poltergeist" do