diff options
| author | John Hawthorn <john@hawthorn.email> | 2019-07-06 12:27:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-06 12:27:03 -0700 |
| commit | bf7ce13908636f619f9c7fe597e493bce2041c8e (patch) | |
| tree | 78eaa59a61f57eabaeb3fbc0fd9c1dd70e9fcea3 | |
| parent | a05a9b0e26d055131a4ed93f2b68abd4f792b376 (diff) | |
| parent | 5dbc814ddfde99c4429532886aaec07c8d6ebb74 (diff) | |
| download | rails-bf7ce13908636f619f9c7fe597e493bce2041c8e.tar.gz rails-bf7ce13908636f619f9c7fe597e493bce2041c8e.tar.bz2 rails-bf7ce13908636f619f9c7fe597e493bce2041c8e.zip | |
Merge pull request #36602 from jhawthorn/system_testing_preload_2
Fix Browser#preload for older Selenium
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/system_testing/browser.rb | 14 |
3 files changed, 14 insertions, 4 deletions
@@ -10,7 +10,7 @@ gemspec gem "rake", ">= 11.1" gem "capybara", ">= 2.15" -gem "selenium-webdriver", ">= 3.5.0" +gem "selenium-webdriver", ">= 3.141.592" gem "rack-cache", "~> 1.2" gem "sass-rails" diff --git a/Gemfile.lock b/Gemfile.lock index c0d2971170..eb7dbf6877 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -582,7 +582,7 @@ DEPENDENCIES rubocop-rails sass-rails sdoc (~> 1.0) - selenium-webdriver (>= 3.5.0) + selenium-webdriver (>= 3.141.592) sequel sidekiq sneakers diff --git a/actionpack/lib/action_dispatch/system_testing/browser.rb b/actionpack/lib/action_dispatch/system_testing/browser.rb index f5f195d876..e861e52f09 100644 --- a/actionpack/lib/action_dispatch/system_testing/browser.rb +++ b/actionpack/lib/action_dispatch/system_testing/browser.rb @@ -46,9 +46,19 @@ module ActionDispatch def preload case type when :chrome - ::Selenium::WebDriver::Chrome::Service.driver_path.try(:call) + if ::Selenium::WebDriver::Service.respond_to? :driver_path= + ::Selenium::WebDriver::Chrome::Service.driver_path.try(:call) + else + # Selenium <= v3.141.0 + ::Selenium::WebDriver::Chrome.driver_path + end when :firefox - ::Selenium::WebDriver::Firefox::Service.driver_path.try(:call) + if ::Selenium::WebDriver::Service.respond_to? :driver_path= + ::Selenium::WebDriver::Firefox::Service.driver_path.try(:call) + else + # Selenium <= v3.141.0 + ::Selenium::WebDriver::Firefox.driver_path + end end end |