From 752c23e2439ac2a84df8c396d2d140b27035a94c Mon Sep 17 00:00:00 2001
From: yoldas <ay6@sanger.ac.uk>
Date: Wed, 3 Jan 2024 01:17:53 +0000
Subject: [PATCH] Fix webdriver

---
 .github/workflows/ruby_test.yml |  2 --
 Gemfile                         |  2 +-
 Gemfile.lock                    | 15 +++++++--------
 test/test_helper.rb             |  2 --
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ruby_test.yml b/.github/workflows/ruby_test.yml
index 6d4e1b86..7e5f496f 100644
--- a/.github/workflows/ruby_test.yml
+++ b/.github/workflows/ruby_test.yml
@@ -22,8 +22,6 @@ jobs:
       with:
         bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml
                             # example if you need more control over bundler.
-    - name: Update webpacker
-      run: RAILS_ENV=test bundle exec rake webdrivers:chromedriver:update
     - name: Test & publish code coverage
       uses: paambaati/codeclimate-action@v2.7.5
       env:
diff --git a/Gemfile b/Gemfile
index 623edc37..b86c6c11 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ group :test do
   gem 'minitest-rails-capybara'
   gem 'mocha'
   gem 'rails-controller-testing'
+  gem 'selenium-webdriver', '~> 4.1', require: false
   gem 'simplecov', require: false
   gem 'timecop'
-  gem 'webdrivers'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 155d17f6..f08f32db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -191,6 +191,8 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
+    nokogiri (1.14.2-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.14.2-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.2-x86_64-linux)
@@ -247,7 +249,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.7.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -278,7 +280,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.8.1)
+    selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -310,12 +312,8 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.4.2)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
     webrick (1.7.0)
-    websocket (1.2.9)
+    websocket (1.2.10)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -326,6 +324,7 @@ GEM
     zeitwerk (2.6.7)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 
@@ -355,12 +354,12 @@ DEPENDENCIES
   rubocop-rails
   sanger_barcode_format!
   sassc-rails
+  selenium-webdriver (~> 4.1)
   sequencescape-client-api
   simplecov
   sprint_client
   timecop
   uglifier (>= 1.3.0)
-  webdrivers
   yard
 
 BUNDLED WITH
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 39005950..4e4127c2 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,8 +6,6 @@
 ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
-require 'webdrivers/chromedriver'
-Webdrivers::Chromedriver.update
 require 'minitest/rails'
 require 'mocha/minitest'
 # To add Capybara feature tests add `gem "minitest-rails-capybara"`