projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13561-collection-versions-api'
[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 33e50087e77d127e9c30991860b92315aade3d33..5fbdd5c6f010c010b0a85c9eeb1c77b9492173a2 100644
(file)
--- a/
apps/workbench/test/integration_helper.rb
+++ b/
apps/workbench/test/integration_helper.rb
@@
-244,7
+244,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