Merge branch 'master' of git.curoverse.com:arvados into 13429-cwl-runner-storage...

[arvados.git] / apps / workbench / test / integration / anonymous_access_test.rb

diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index d69de2c8b156d719b6f69d58c647100fd11d356d..8d772b087f54f02d0f2172d6820bec3823d36baf 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']
-    logblock = `echo -n #{magic.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
-    assert $?.success?, $?
-    col = nil
-    use_token 'admin' do
-      mtxt = ". #{logblock} 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
@@ -268,7 +259,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
       if objects_readable
         assert_selector 'a[href="#Log"]', text: 'Log'
         assert_no_selector 'a[data-toggle="disabled"]', text: 'Log'
-        assert_no_text 'Output data not available'
+        assert_no_text 'zzzzz-4zz18-bv31uwvy3neko21 (Unavailable)'
         if pipeline_page
           assert_text 'This pipeline was created from'
           job_id = object['components']['foo']['job']['uuid']
@@ -283,7 +274,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         end
       else
         assert_selector 'a[data-toggle="disabled"]', text: 'Log'
-        assert_text 'Output data not available'
+        assert_text 'zzzzz-4zz18-bv31uwvy3neko21 (Unavailable)'
         assert_text object['job']
         if pipeline_page
           assert_no_text 'This pipeline was created from'  # template is not readable
@@ -291,7 +282,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
           assert_text 'Log unavailable'
         end
         find(:xpath, "//a[@href='#Log']").click
-        assert_text 'Output data not available'
+        assert_text 'zzzzz-4zz18-bv31uwvy3neko21 (Unavailable)'
         assert_no_text expect_log_text
       end
     end