From 5667c0058758f0d04fedb1c5c48418fe4554fd97 Mon Sep 17 00:00:00 2001
From: Eelco de Vlieger <eelcodevlieger@hotmail.com>
Date: Wed, 8 May 2019 19:10:14 +0100
Subject: [PATCH] issue 3450 - add webdrivers dependency (+ spec helper setup)
 and remove chromedriver-helper dependency
 https://github.com/openfoodfoundation/openfoodnetwork/issues/3450

---
 Gemfile             | 2 +-
 spec/spec_helper.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e0792b3fc..4a550c16ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -126,7 +126,7 @@ group :test, :development do
   gem 'letter_opener', '>= 1.4.1'
   gem 'timecop'
   gem 'selenium-webdriver'
-  gem 'chromedriver-helper'
+  gem 'webdrivers', '~> 3.8'
   gem 'rspec-retry'
   gem 'json_spec', '~> 1.1.4'
   gem 'unicorn-rails'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3b0ae37fb7..1f1af38528 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -22,10 +22,16 @@ require 'database_cleaner'
 require 'rspec/retry'
 require 'paper_trail/frameworks/rspec'
 
+require 'webdrivers'
+
 # Allow connections to phantomjs/selenium whilst raising errors
 # when connecting to external sites
 require 'webmock/rspec'
-WebMock.disable_net_connect!(:allow_localhost => true)
+WebMock.enable!
+WebMock.disable_net_connect!({
+  allow_localhost: true,
+  allow: 'chromedriver.storage.googleapis.com'
+})
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.