From d1b90193a4eee60acab022041fe9b21be6eeb723 Mon Sep 17 00:00:00 2001
From: filipefurtad0 <filipefurtado@gmail.com>
Date: Thu, 11 Aug 2022 10:33:28 +0100
Subject: [PATCH 1/3] Removes selenium-webdriver & webdrivers gems

---
 Gemfile      |  2 --
 Gemfile.lock | 13 +------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6a740d1f68..a9ac159bb0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -152,10 +152,8 @@ group :test, :development do
   gem 'rspec-rails', ">= 3.5.2"
   gem 'rspec-retry'
   gem 'rswag-specs'
-  gem 'selenium-webdriver'
   gem 'shoulda-matchers'
   gem 'timecop'
-  gem 'webdrivers'
   gem 'debug', '>= 1.0.0'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ec72bde68..c9abe54238 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -580,11 +580,6 @@ GEM
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
     sd_notify (0.1.1)
-    selenium-webdriver (4.3.0)
-      childprocess (>= 0.5, < 5.0)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
     semantic_range (3.0.0)
     shoulda-matchers (5.1.0)
       activesupport (>= 5.2.0)
@@ -657,10 +652,6 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.0.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
     webmock (3.17.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -793,7 +784,6 @@ DEPENDENCIES
   rubocop-rails
   sd_notify
   select2-rails!
-  selenium-webdriver
   shoulda-matchers
   sidekiq
   sidekiq-scheduler
@@ -813,7 +803,6 @@ DEPENDENCIES
   view_component_storybook
   web!
   web-console
-  webdrivers
   webmock
   webpacker (~> 5)
   whenever
@@ -824,4 +813,4 @@ RUBY VERSION
    ruby 3.0.3p157
 
 BUNDLED WITH
-   2.1.4
+   2.1.4
\ No newline at end of file

From e5eb74f077b96a516ac330a82fd02142803621d2 Mon Sep 17 00:00:00 2001
From: filipefurtad0 <filipefurtado@gmail.com>
Date: Thu, 11 Aug 2022 10:43:27 +0100
Subject: [PATCH 2/3] Updates spec_helper

---
 spec/spec_helper.rb | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 566a1648a6..c9bee1d80e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,8 +3,6 @@
 require 'base_spec_helper'
 
 require 'database_cleaner'
-require 'webdrivers'
-require 'selenium-webdriver'
 require 'view_component/test_helpers'
 
 # This spec_helper.rb is being used by the custom engines in engines/. The engines are not set up to
@@ -15,17 +13,6 @@ unless ENV['DISABLE_KNAPSACK']
   Knapsack::Adapters::RSpecAdapter.bind
 end
 
-Capybara.register_driver :chrome do |app|
-  options = Selenium::WebDriver::Chrome::Options.new(
-    args: %w[headless disable-gpu no-sandbox window-size=1280,768]
-  )
-  options.add_preference(:download, default_directory: DownloadsHelper.path.to_s)
-
-  Capybara::Selenium::Driver
-    .new(app, browser: :chrome, options: options)
-    .tap { |driver| driver.browser.download_path = DownloadsHelper.path.to_s }
-end
-
 Capybara.javascript_driver = :chrome
 Capybara.default_max_wait_time = 30
 Capybara.disable_animation = true
@@ -45,13 +32,6 @@ RSpec.configure do |config|
   config.before(:each)           { DatabaseCleaner.start }
   config.after(:each)            { DatabaseCleaner.clean }
 
-  def restart_driver
-    Capybara.send('session_pool').values
-      .select { |s| s.driver.is_a?(Capybara::Selenium::Driver) }
-      .each { |s| s.driver.reset! }
-  end
-  config.before(:all) { restart_driver }
-
   config.after(:each, js: true) do
     Capybara.reset_sessions!
   end

From 1fd09617cb87e3b1f39d35dd6bbd6d02e683edc6 Mon Sep 17 00:00:00 2001
From: filipefurtad0 <filipefurtado@gmail.com>
Date: Tue, 9 Aug 2022 13:27:30 +0100
Subject: [PATCH 3/3] Changes cookies_spec from feature to system spec

---
 .../spec/features => spec/system}/consumer/cookies_spec.rb    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename {engines/web/spec/features => spec/system}/consumer/cookies_spec.rb (98%)

diff --git a/engines/web/spec/features/consumer/cookies_spec.rb b/spec/system/consumer/cookies_spec.rb
similarity index 98%
rename from engines/web/spec/features/consumer/cookies_spec.rb
rename to spec/system/consumer/cookies_spec.rb
index 48c1845b84..bf633c0c8e 100644
--- a/engines/web/spec/features/consumer/cookies_spec.rb
+++ b/spec/system/consumer/cookies_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'system_helper'
 
-feature "Cookies", js: true do
+describe "Cookies", js: true do
   describe "banner" do
     # keeps banner toggle config unchanged
     around do |example|