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..d1884ac44d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,7 +292,7 @@ GEM sprockets-rails tilt selectize-rails (0.12.6) - selenium-webdriver (4.9.0) + selenium-webdriver (4.15.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -322,16 +322,12 @@ 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) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.1) - websocket (1.2.9) + websocket (1.2.10) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -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/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..512e8605fd 100644 --- a/spec/support/webmock.rb +++ b/spec/support/webmock.rb @@ -1,11 +1,4 @@ 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"] - -# Additionally, avoid conflict with Selenium (localhost) -WebMock.disable_net_connect!(allow_localhost: true, allow: driver_hosts) +# Avoid conflict with Selenium (localhost) +WebMock.disable_net_connect!(allow_localhost: true)