14407: Upgrade selenium-webdriver, add geckodriver.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index b62df6c0219b401110134603591a75aeee9bda0f..7150faa9e12767db52ae6d11416122038c8875cd 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -41,9 +41,7 @@ end
 
 group :test, :diagnostics, :performance do
   gem 'minitest', '~> 5.10.3'
-  # Selenium-webdriver 3.x is producing problems like the one described here:
-  # https://stackoverflow.com/questions/41310586/ruby-selenium-webdriver-unable-to-find-mozilla-geckodriver
-  gem 'selenium-webdriver', '~> 2.53.1'
+  gem 'selenium-webdriver', '~> 3'
   gem 'capybara', '~> 2.5.0'
   gem 'poltergeist', '~> 1.5.1'
   gem 'headless', '~> 1.0.2'

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 06460ad06c1487d1d0c2e08978f36c644de95624..42a321125ec14c861f7c1cc92697e12928517082 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coffee-rails (4.2.2)
@@ -101,7 +101,7 @@ GEM
     extlib (0.9.16)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23)
+    ffi (1.9.25)
     flamegraph (0.9.5)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
@@ -245,7 +245,7 @@ GEM
     retriable (1.4.1)
     ruby-debug-passenger (0.2.0)
     ruby-prof (0.17.0)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     rvm-capistrano (1.5.6)
       capistrano (~> 2.15.4)
     safe_yaml (1.0.4)
@@ -260,10 +260,9 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (2.53.4)
+    selenium-webdriver (3.14.1)
       childprocess (~> 0.5)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
+      rubyzip (~> 1.2, >= 1.2.2)
     signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -295,7 +294,6 @@ GEM
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    websocket (1.2.5)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -348,7 +346,7 @@ DEPENDENCIES
   safe_yaml
   sass
   sass-rails
-  selenium-webdriver (~> 2.53.1)
+  selenium-webdriver (~> 3)
   simplecov (~> 0.7)
   simplecov-rcov
   sshkey
@@ -358,4 +356,4 @@ DEPENDENCIES
   wiselinks
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 5fbdd5c6f010c010b0a85c9eeb1c77b9492173a2..224de20f17307ff0f82269e79dcceadf4f1e1158 100644 (file)
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -29,6 +29,9 @@ end
 def selenium_opts
   {
     port: available_port('selenium'),
+    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(
+      acceptInsecureCerts: true,
+    ),
   }
 end
 

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 26a907fc2f99f36b7cc7d0aa7fa8d2bf097af5f0..9660fcf0e1a0a4c45150e232463516e0045e9ed7 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -245,6 +245,8 @@ sanity_checks() {
     which Xvfb || fatal "No xvfb. Try: apt-get install xvfb"
     echo -n 'graphviz: '
     dot -V || fatal "No graphviz. Try: apt-get install graphviz"
+    echo -n 'geckodriver: '
+    geckodriver --version | grep ^geckodriver || fatal "No geckodriver. Try: wget -O- https://github.com/mozilla/geckodriver/releases/download/v0.23.0/geckodriver-v0.23.0-linux64.tar.gz | sudo tar -C /usr/local/bin -xzf - geckodriver"
 
     if [[ "$NEED_SDK_R" = true ]]; then
       # R SDK stuff