Fix webdrivers on 7-0-stable branch for issue #48973.

Update `Gemfile.lock`.
rails · Aug 19, 2023 · 43f47b6 · 43f47b6
1 parent 20c3171
commit 43f47b6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,12 @@ gem "rake", ">= 13"
 gem "sprockets-rails", ">= 2.0.0"
 gem "propshaft", ">= 0.1.7"
 gem "capybara", ">= 3.26"
-gem "selenium-webdriver", ">= 4.0.0"
+if RUBY_VERSION < "3"
+  gem "selenium-webdriver", "<= 4.9.0"
+  gem "webdrivers"
+else
+  gem "selenium-webdriver", ">= 4.11.0"
+end
 
 gem "rack-cache", "~> 1.2"
 gem "stimulus-rails"
@@ -109,10 +114,6 @@ end
 gem "aws-sdk-sns", require: false
 gem "webmock"
 
-group :ujs do
-  gem "webdrivers"
-end
-
 # Action View
 group :view do
   gem "blade", require: false, platforms: [:ruby]

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -477,7 +477,7 @@ GEM
       fugit (~> 1.1, >= 1.1.6)
     sdoc (2.6.0)
       rdoc (>= 5.0)
-    selenium-webdriver (4.7.1)
+    selenium-webdriver (4.11.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -556,10 +556,6 @@ GEM
       json (>= 1.8)
       nokogiri (~> 1.6)
       rexml (~> 3.2)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -640,7 +636,7 @@ DEPENDENCIES
   rubocop-rails
   rubyzip (~> 2.0)
   sdoc (>= 2.3.0)
-  selenium-webdriver (>= 4.0.0)
+  selenium-webdriver (>= 4.11.0)
   sequel
   sidekiq
   sneakers
@@ -656,7 +652,6 @@ DEPENDENCIES
   tzinfo-data
   w3c_validators (~> 1.3.6)
   wdm (>= 0.1.0)
-  webdrivers
   webmock
   webrick
   websocket-client-simple!

diff --git a/actionpack/lib/action_dispatch/system_testing/browser.rb b/actionpack/lib/action_dispatch/system_testing/browser.rb
@@ -26,7 +26,7 @@ def configure
         yield options if block_given? && options
       end
 
-      # driver_path can be configured as a proc. The webdrivers gem uses this
+      # driver_path can be configured as a proc.
       # proc to update web drivers. Running this proc early allows us to only
       # update the webdriver once and avoid race conditions when using
       # parallel tests.

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Omit `webdrivers` gem dependency from `Gemfile` template
+
+    *Sean Doyle*
+
 ## Rails 7.0.7 (August 09, 2023) ##
 
 *   Update default scaffold templates to set 303 (See Other) as status code

diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt
@@ -63,6 +63,8 @@ group :test do
   # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
   gem "capybara"
   gem "selenium-webdriver"
+<%- if RUBY_VERSION < "3.0" -%>
   gem "webdrivers"
+<% end %>
 end
 <%- end -%>