X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5523be76b00bc58cf9568cf7a1353326c6795cac..9b3223e5cbcd1eb89193e8421d430025ddf791d1:/apps/workbench/test/integration_helper.rb diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb index 1a6a4f054a..39fdf4b260 100644 --- 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-' + rand(2**20).to_s(36) + magic = 'received-dom-event-' + rand(2**30).to_s(36) page.evaluate_script <'); + $('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