11167: Refactored tests to use new helper function.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@curoverse.com>

diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index fef83ba4e8440e70233321652afa33817b28c5b1..6971c39f3385f59674a681e7ccb38cf1f0d9f2b4 100644 (file)
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -122,17 +122,8 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
     use_keep_web_config
 
     magic = rand(2**512).to_s 36
-    token = api_fixture('api_client_authorizations')['admin']['api_token']
-    datablock = `echo -n #{magic.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
-    assert $?.success?, $?
-    col = nil
-    use_token 'admin' do
-      mtxt = ". #{datablock} 0:#{magic.length}:Hello\\040world.txt\n"
-      col = Collection.create(
-        manifest_text: mtxt,
-        owner_uuid: api_fixture('groups')['anonymously_accessible_project']['uuid'])
-    end
-
+    owner = api_fixture('groups')['anonymously_accessible_project']['uuid']
+    col = upload_data_and_get_collection(magic, 'admin', "Hello\\040world.txt", owner)
     visit '/collections/' + col.uuid
     find('tr,li', text: 'Hello world.txt').
       find('a[title~=View]').click

diff --git a/apps/workbench/test/integration/jobs_test.rb b/apps/workbench/test/integration/jobs_test.rb
index 8e49aaf273d6c2e997d76aa39e322b3781221a05..4b89b5daa97d179df8f5fb1081dbbd9183193602 100644 (file)
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -45,16 +45,12 @@ class JobsTest < ActionDispatch::IntegrationTest
     # This config will be restored during teardown by ../test_helper.rb:
     Rails.configuration.log_viewer_max_bytes = 100
 
-    token = api_fixture('api_client_authorizations')['active']['api_token']
     logdata = fakepipe_with_log_data.read
-    logblock = `echo -n #{logdata.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
-    assert $?.success?, $?
-
+    job_uuid = api_fixture('jobs')['running']['uuid']
+    logcollection = upload_data_and_get_collection(logdata, 'active', "#{job_uuid}.log.txt")
     job = nil
     use_token 'active' do
-      job = Job.find api_fixture('jobs')['running']['uuid']
-      mtxt = ". #{logblock} 0:#{logdata.length}:#{job.uuid}.log.txt\n"
-      logcollection = Collection.create(manifest_text: mtxt)
+      job = Job.find job_uuid
       job.update_attributes log: logcollection.portable_data_hash
     end
     visit page_with_token 'active', '/jobs/'+job.uuid