diff --git a/Gemfile b/Gemfile index c3e5133a36..d11178696f 100644 --- a/Gemfile +++ b/Gemfile @@ -31,10 +31,9 @@ group :test do gem "database_cleaner" gem "formulaic" gem "launchy" - gem "selenium-webdriver", "= 4.9.0" + gem "selenium-webdriver" gem "shoulda-matchers" gem "timecop" - gem "webdrivers" gem "webmock" gem "webrick" gem "xpath", "3.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index cd1f65134b..63c9a075f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -322,10 +322,6 @@ GEM unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) - webdrivers (5.2.0) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0) webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) @@ -366,13 +362,12 @@ DEPENDENCIES pundit rack-timeout redcarpet - selenium-webdriver (= 4.9.0) + selenium-webdriver sentry-raven shoulda-matchers timecop uglifier unicorn - webdrivers webmock webrick xpath (= 3.2.0) diff --git a/gemfiles/pundit21.gemfile b/gemfiles/pundit21.gemfile index d6856af0b6..834eb80ae4 100644 --- a/gemfiles/pundit21.gemfile +++ b/gemfiles/pundit21.gemfile @@ -32,10 +32,9 @@ group :test do gem "database_cleaner" gem "formulaic" gem "launchy" - gem "selenium-webdriver", "= 4.9.0" + gem "selenium-webdriver" gem "shoulda-matchers" gem "timecop" - gem "webdrivers" gem "webmock" gem "webrick" gem "xpath", "3.2.0" diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index 2bbd77b6de..8f7232899c 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -33,10 +33,9 @@ group :test do gem "database_cleaner" gem "formulaic" gem "launchy" - gem "selenium-webdriver", "= 4.9.0" + gem "selenium-webdriver" gem "shoulda-matchers" gem "timecop" - gem "webdrivers" gem "webmock" gem "webrick" gem "xpath", "3.2.0" diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile index d65debfe89..8754535c85 100644 --- a/gemfiles/rails61.gemfile +++ b/gemfiles/rails61.gemfile @@ -33,10 +33,9 @@ group :test do gem "database_cleaner" gem "formulaic" gem "launchy" - gem "selenium-webdriver", "= 4.9.0" + gem "selenium-webdriver" gem "shoulda-matchers" gem "timecop" - gem "webdrivers" gem "webmock" gem "webrick" gem "xpath", "3.2.0" diff --git a/gemfiles/rails70.gemfile b/gemfiles/rails70.gemfile index 20d902bb9b..95d00daba8 100644 --- a/gemfiles/rails70.gemfile +++ b/gemfiles/rails70.gemfile @@ -33,10 +33,9 @@ group :test do gem "database_cleaner" gem "formulaic" gem "launchy" - gem "selenium-webdriver", "= 4.9.0" + gem "selenium-webdriver" gem "shoulda-matchers" gem "timecop" - gem "webdrivers" gem "webmock" gem "webrick" gem "xpath", "3.2.0" diff --git a/spec/support/webdrivers.rb b/spec/support/webdrivers.rb index 08fdf3dee2..500ed1181f 100644 --- a/spec/support/webdrivers.rb +++ b/spec/support/webdrivers.rb @@ -1,7 +1,5 @@ require "selenium/webdriver" -Webdrivers::Chromedriver.required_version = "114.0.5735.90" - Capybara.register_driver :chrome do |app| Capybara::Selenium::Driver.new(app, browser: :chrome) end diff --git a/spec/support/webmock.rb b/spec/support/webmock.rb index dbca72cb87..0b515bc672 100644 --- a/spec/support/webmock.rb +++ b/spec/support/webmock.rb @@ -1,11 +1,7 @@ require "webmock/rspec" -# Allow downloading webdrivers for Selenium -driver_hosts = Webdrivers::Common.subclasses. - map { |driver| URI(driver.base_url).host } - # Downloading the Firefox driver involves a redirect -driver_hosts += ["github-releases.githubusercontent.com"] +driver_hosts = ["github-releases.githubusercontent.com"] # Additionally, avoid conflict with Selenium (localhost) WebMock.disable_net_connect!(allow_localhost: true, allow: driver_hosts)