5416: Merge branch 'master' into 5416-arv-git-httpd

[arvados.git] / apps / workbench / test / integration_helper.rb

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index f430e842eb9c1a8068474b4da517baf3762235ec..39fdf4b260abd68be05f252158f29629aa199199 100644 (file)
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -4,12 +4,19 @@ require 'capybara/poltergeist'
 require 'uri'
 require 'yaml'
 
+POLTERGEIST_OPTS = {
+  window_size: [1200, 800],
+  phantomjs_options: ['--ignore-ssl-errors=true'],
+  inspector: true,
+}
+
 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new app, {
-    window_size: [1200, 800],
-    phantomjs_options: ['--ignore-ssl-errors=true'],
-    inspector: true,
-  }
+  Capybara::Poltergeist::Driver.new app, POLTERGEIST_OPTS
+end
+
+Capybara.register_driver :poltergeist_without_file_api do |app|
+  js = File.expand_path '../support/remove_file_api.js', __FILE__
+  Capybara::Poltergeist::Driver.new app, POLTERGEIST_OPTS.merge(extensions: [js])
 end
 
 module WaitForAjax
@@ -29,15 +36,15 @@ module AssertDomEvent
   # Yield the supplied block, then wait for an event to arrive at a
   # DOM element.
   def assert_triggers_dom_event events, target='body'
-    magic = 'RXC0lObcVwEXwSvA'
+    magic = 'received-dom-event-' + rand(2**30).to_s(36)
     page.evaluate_script <<eos
       $('#{target}').one('#{events}', function() {
-        $('body').append('<div id="#{magic}"></div>');
+        $('body').addClass('#{magic}');
       });
 eos
     yield
-    assert_selector "##{magic}"
-    page.evaluate_script "$('##{magic}').remove();";
+    assert_selector "body.#{magic}"
+    page.evaluate_script "$('body').removeClass('#{magic}');";
   end
 end
 
@@ -98,9 +105,11 @@ class ActionDispatch::IntegrationTest
     # fixture, or passed as a raw string.
     api_token = ((@@API_AUTHS.include? token) ?
                  @@API_AUTHS[token]['api_token'] : token)
-    sep = (path.include? '?') ? '&' : '?'
+    path_parts = path.partition("#")
+    sep = (path_parts.first.include? '?') ? '&' : '?'
     q_string = URI.encode_www_form('api_token' => api_token)
-    "#{path}#{sep}#{q_string}"
+    path_parts.insert(1, "#{sep}#{q_string}")
+    path_parts.join("")
   end
 
   # Find a page element, but return false instead of raising an