X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4c0dadce18cdc9fd2712b836100a4cf7b9c69188..dd5efa11702934a9e00ae05b76f3f0279e1c36df:/apps/workbench/test/integration_helper.rb?ds=sidebyside

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index ef2779cc3e..1af7245a4e 100644
--- 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
 
@@ -100,14 +103,14 @@ module AssertDomEvent
   # DOM element.
   def assert_triggers_dom_event events, target='body'
     magic = 'received-dom-event-' + rand(2**30).to_s(36)
-    page.evaluate_script <<eos
+    page.execute_script <<eos
       $('#{target}').one('#{events}', function() {
         $('body').addClass('#{magic}');
       });
 eos
     yield
     assert_selector "body.#{magic}"
-    page.evaluate_script "$('body').removeClass('#{magic}');";
+    page.execute_script "$('body').removeClass('#{magic}');";
   end
 end
 
@@ -221,6 +224,8 @@ class ActionDispatch::IntegrationTest
     end
     if Capybara.current_driver == :selenium
       page.execute_script("window.localStorage.clear()")
+    else
+      page.driver.restart if defined?(page.driver.restart)
     end
     Capybara.reset_sessions!
   end
@@ -242,7 +247,7 @@ class ActionDispatch::IntegrationTest
 end
 
 def upload_data_and_get_collection(data, user, filename, owner_uuid=nil)
-  token = api_fixture('api_client_authorizations')[user]['api_token']
+  token = api_token(user)
   datablock = `echo -n #{data.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
   assert $?.success?, $?
   col = nil