From 2512f24ef40f4c678c8dc364cdcaff09d4d5a65d Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sun, 24 Mar 2019 16:05:30 -0500
Subject: Use webdrivers instead of chromedriver-helper for AV UJS tests
---
Gemfile | 2 +-
Gemfile.lock | 14 +++++++-------
ci/qunit-selenium-runner.rb | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index d5c2ee9d28..53f8512cc5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -92,7 +92,7 @@ gem "webmock"
group :ujs do
gem "qunit-selenium"
- gem "chromedriver-helper"
+ gem "webdrivers"
end
# Add your own local bundler stuff.
diff --git a/Gemfile.lock b/Gemfile.lock
index a7da2311b6..d4c2808b38 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -110,8 +110,6 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
amq-protocol (2.3.0)
- archive-zip (0.11.0)
- io-like (~> 0.3.0)
ast (2.4.0)
aws-eventstream (1.0.1)
aws-partitions (1.111.0)
@@ -185,9 +183,6 @@ GEM
xpath (~> 3.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
- chromedriver-helper (2.1.0)
- archive-zip (~> 0.10)
- nokogiri (~> 1.8)
coffee-script (2.4.1)
coffee-script-source
execjs
@@ -282,7 +277,6 @@ GEM
image_processing (1.7.1)
mini_magick (~> 4.0)
ruby-vips (>= 2.0.13, < 3)
- io-like (0.3.0)
jaro_winkler (1.5.2)
jaro_winkler (1.5.2-java)
jdbc-mysql (5.1.46)
@@ -336,6 +330,7 @@ GEM
mysql2 (0.5.2)
mysql2 (0.5.2-x64-mingw32)
mysql2 (0.5.2-x86-mingw32)
+ net_http_ssl_fix (0.0.10)
nio4r (2.3.1)
nio4r (2.3.1-java)
nokogiri (1.9.1)
@@ -501,6 +496,11 @@ GEM
json (>= 1.8)
nokogiri (~> 1.6)
wdm (0.1.1)
+ webdrivers (3.7.0)
+ net_http_ssl_fix
+ nokogiri (~> 1.6)
+ rubyzip (~> 1.0)
+ selenium-webdriver (~> 3.0)
webmock (3.4.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
@@ -540,7 +540,6 @@ DEPENDENCIES
bootsnap (>= 1.4.0)
byebug
capybara (>= 2.15)
- chromedriver-helper
connection_pool
dalli
delayed_job
@@ -587,6 +586,7 @@ DEPENDENCIES
uglifier (>= 1.3.0)
w3c_validators
wdm (>= 0.1.0)
+ webdrivers
webmock
webpacker (~> 4.0)
websocket-client-simple!
diff --git a/ci/qunit-selenium-runner.rb b/ci/qunit-selenium-runner.rb
index 1df6aedb36..b7013c258a 100644
--- a/ci/qunit-selenium-runner.rb
+++ b/ci/qunit-selenium-runner.rb
@@ -5,7 +5,7 @@ require "qunit/selenium/test_runner"
if ARGV[1]
driver = ::Selenium::WebDriver.for(:remote, url: ARGV[1], desired_capabilities: :chrome)
else
- require "chromedriver-helper"
+ require "webdrivers"
driver_options = Selenium::WebDriver::Chrome::Options.new
driver_options.add_argument("--headless")
--
cgit v1.2.3