projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14398-error-deadlock'
[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 ef2779cc3e78eedb556ce2dc7114a6e2466112b0..1af7245a4ea93a4c449be6e7aac65d6d08f24f98 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'),
def selenium_opts
{
port: available_port('selenium'),
+ desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(
+ acceptInsecureCerts: true,
+ ),
}
end
}
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)
# DOM element.
def assert_triggers_dom_event events, target='body'
magic = 'received-dom-event-' + rand(2**30).to_s(36)
- page.e
valua
te_script <<eos
+ page.e
xecu
te_script <<eos
$('#{target}').one('#{events}', function() {
$('body').addClass('#{magic}');
});
eos
yield
assert_selector "body.#{magic}"
$('#{target}').one('#{events}', function() {
$('body').addClass('#{magic}');
});
eos
yield
assert_selector "body.#{magic}"
- page.e
valua
te_script "$('body').removeClass('#{magic}');";
+ page.e
xecu
te_script "$('body').removeClass('#{magic}');";
end
end
end
end
@@
-221,6
+224,8
@@
class ActionDispatch::IntegrationTest
end
if Capybara.current_driver == :selenium
page.execute_script("window.localStorage.clear()")
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
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)
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
datablock = `echo -n #{data.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
assert $?.success?, $?
col = nil