Merge branch 'develop' into depfu/update/rubocop-performance-1.18.0

Gemfile

@@ -64,8 +64,7 @@ group :test do
   gem 'launchy'
   gem 'rspec-collection_matchers'
   gem 'rspec-rails', '~> 3.5.0'
+  gem 'selenium-webdriver', '~> 4.1', require: false
   gem 'simplecov', require: false
   gem 'timecop'
-  # Keep webdriver in sync with chrome to prevent frustrating CI failures
-  gem 'webdrivers', require: false
 end

Gemfile.lock

@@ -138,7 +138,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.14.2)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -283,10 +283,6 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
     websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -324,13 +320,13 @@ DEPENDENCIES
   rubocop-rspec
   sass-rails (~> 6.0)
   sdoc (~> 2.4.0)
+  selenium-webdriver (~> 4.1)
   simplecov
   spring
   timecop
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 4.0.4)
-  webdrivers
 
 BUNDLED WITH
    2.3.18

spec/rails_helper.rb

@@ -6,7 +6,7 @@
 require File.expand_path('../config/environment', __dir__)
 require 'rspec/rails'
 require 'spec_helper'
-require 'webdrivers/chromedriver'
+
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

spec/spec_helper.rb

@@ -17,8 +17,7 @@
 #
 # require 'database_cleaner'
 
-require 'webdrivers/chromedriver'
-Webdrivers::Chromedriver.update
+require 'selenium-webdriver'
 
 require 'factory_bot'
 require 'capybara/rspec'