diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-12-07 14:44:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-07 14:44:05 -0500 |
commit | e8c3b58cb6e1dd204dd586f1cf6c3e482fb80abe (patch) | |
tree | 67bd58d296bb59a9fa8d8cf285a753bf9c066589 /actionpack/lib | |
parent | 6a8ce7416d6615a13ee5c4b9f6bcd91cc5adef4d (diff) | |
parent | 82b974813b28748e5affcff1d8c4ad60ab2971be (diff) | |
download | rails-e8c3b58cb6e1dd204dd586f1cf6c3e482fb80abe.tar.gz rails-e8c3b58cb6e1dd204dd586f1cf6c3e482fb80abe.tar.bz2 rails-e8c3b58cb6e1dd204dd586f1cf6c3e482fb80abe.zip |
Merge pull request #31365 from bogdanvlviv/add-headless_firefox-driver-to-system_tests
Add headless firefox driver to System Tests
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/system_test_case.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/system_testing/driver.rb | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/system_test_case.rb b/actionpack/lib/action_dispatch/system_test_case.rb index 7246e01cff..99d0c06751 100644 --- a/actionpack/lib/action_dispatch/system_test_case.rb +++ b/actionpack/lib/action_dispatch/system_test_case.rb @@ -121,11 +121,15 @@ module ActionDispatch # # driven_by :poltergeist # - # driven_by :selenium, using: :firefox + # driven_by :selenium, screen_size: [800, 800] + # + # driven_by :selenium, using: :chrome # # driven_by :selenium, using: :headless_chrome # - # driven_by :selenium, screen_size: [800, 800] + # driven_by :selenium, using: :firefox + # + # driven_by :selenium, using: :headless_firefox def self.driven_by(driver, using: :chrome, screen_size: [1400, 1400], options: {}) self.driver = SystemTesting::Driver.new(driver, using: using, screen_size: screen_size, options: options) end diff --git a/actionpack/lib/action_dispatch/system_testing/driver.rb b/actionpack/lib/action_dispatch/system_testing/driver.rb index 2687772b4b..280989a146 100644 --- a/actionpack/lib/action_dispatch/system_testing/driver.rb +++ b/actionpack/lib/action_dispatch/system_testing/driver.rb @@ -38,13 +38,24 @@ module ActionDispatch browser_options.args << "--disable-gpu" @options.merge(options: browser_options) + elsif @browser == :headless_firefox + browser_options = Selenium::WebDriver::Firefox::Options.new + browser_options.args << "-headless" + + @options.merge(options: browser_options) else @options end end def browser - @browser == :headless_chrome ? :chrome : @browser + if @browser == :headless_chrome + :chrome + elsif @browser == :headless_firefox + :firefox + else + @browser + end end def register_selenium(app) |