From cd4541a1aa7f306d59d167fade17dff17d57ac75 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@hawthorn.email>
Date: Thu, 4 Jul 2019 14:47:21 -0700
Subject: Fix Browser#preload for older Selenium

Older versions of selenium had driver_path on
::Selenium::WebDriver::Chrome directly, not on Service. This avoids
errors on those old versions and will preload properly if webdrivers is
installed.
---
 actionpack/lib/action_dispatch/system_testing/browser.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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
 
-- 
cgit v1.2.3


From 5dbc814ddfde99c4429532886aaec07c8d6ebb74 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@hawthorn.email>
Date: Thu, 4 Jul 2019 16:17:39 -0700
Subject: Bump minimum selenium-webdriver version

Since #36424, we need an newer version in order to pass.
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9eb449316c..52914b6698 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
-- 
cgit v1.2.3