Skip to content

Commit 0919aa9

Browse files
authored
Merge pull request rails#43498 from kamipo/require-selenium-webdriver-4.0
Rails 7.0 requires selenium-webdriver >= 4.0.0
2 parents 908f6e9 + dd855fd commit 0919aa9

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem "rake", ">= 11.1"
1212
gem "sprockets-rails", ">= 2.0.0"
1313
gem "propshaft", ">= 0.1.7"
1414
gem "capybara", ">= 3.26"
15-
gem "selenium-webdriver", ">= 4.0.0.alpha7"
15+
gem "selenium-webdriver", ">= 4.0.0"
1616

1717
gem "rack-cache", "~> 1.2"
1818
gem "stimulus-rails"

Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -430,14 +430,14 @@ GEM
430430
ruby-vips (2.1.2)
431431
ffi (~> 1.12)
432432
ruby2_keywords (0.0.4)
433-
rubyzip (2.3.0)
433+
rubyzip (2.3.2)
434434
rufus-scheduler (3.7.0)
435435
fugit (~> 1.1, >= 1.1.6)
436436
sdoc (2.2.0)
437437
rdoc (>= 5.0)
438-
selenium-webdriver (4.0.0.beta4)
438+
selenium-webdriver (4.0.3)
439439
childprocess (>= 0.5, < 5.0)
440-
rexml (~> 3.2)
440+
rexml (~> 3.2, >= 3.2.5)
441441
rubyzip (>= 1.2.2)
442442
sequel (5.45.0)
443443
serverengine (2.0.7)
@@ -505,10 +505,10 @@ GEM
505505
json (>= 1.8)
506506
nokogiri (~> 1.6)
507507
rexml (~> 3.2)
508-
webdrivers (4.7.0)
508+
webdrivers (5.0.0)
509509
nokogiri (~> 1.6)
510510
rubyzip (>= 1.3.0)
511-
selenium-webdriver (> 3.141, < 5.0)
511+
selenium-webdriver (~> 4.0)
512512
webmock (3.13.0)
513513
addressable (>= 2.3.6)
514514
crack (>= 0.3.2)
@@ -584,7 +584,7 @@ DEPENDENCIES
584584
rubocop-performance
585585
rubocop-rails
586586
sdoc (>= 2.2.0)
587-
selenium-webdriver (>= 4.0.0.alpha7)
587+
selenium-webdriver (>= 4.0.0)
588588
sequel
589589
sidekiq
590590
sneakers

actionpack/lib/action_dispatch/system_testing/browser.rb

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,9 @@ def configure
3333
def preload
3434
case type
3535
when :chrome
36-
if ::Selenium::WebDriver::Service.respond_to? :driver_path=
37-
::Selenium::WebDriver::Chrome::Service.driver_path&.call
38-
else
39-
# Selenium <= v3.141.0
40-
::Selenium::WebDriver::Chrome.driver_path
41-
end
36+
::Selenium::WebDriver::Chrome::Service.driver_path&.call
4237
when :firefox
43-
if ::Selenium::WebDriver::Service.respond_to? :driver_path=
44-
::Selenium::WebDriver::Firefox::Service.driver_path&.call
45-
else
46-
# Selenium <= v3.141.0
47-
::Selenium::WebDriver::Firefox.driver_path
48-
end
38+
::Selenium::WebDriver::Firefox::Service.driver_path&.call
4939
end
5040
end
5141

actionpack/lib/action_dispatch/system_testing/driver.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def initialize(driver_type, **options, &capabilities)
2121
end
2222

2323
if driver_type == :selenium
24+
gem "selenium-webdriver", ">= 4.0.0"
2425
require "selenium/webdriver"
2526
@browser = Browser.new(options[:using])
2627
@browser.preload

0 commit comments

Comments
 (0)