X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/12319740a7d95c099a5521fd85a3200528307de1..3aaefcb3c76ff470b475d950398d01255e87712a:/apps/workbench/test/integration/anonymous_access_test.rb?ds=sidebyside

diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index d69de2c8b1..e47f1ae2e9 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -5,8 +5,6 @@
 require 'integration_helper'
 
 class AnonymousAccessTest < ActionDispatch::IntegrationTest
-  include KeepWebConfig
-
   # These tests don't do state-changing API calls. Save some time by
   # skipping the database reset.
   reset_api_fixtures :after_each_test, false
@@ -14,7 +12,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
 
   setup do
     need_javascript
-    Rails.configuration.anonymous_user_token = api_fixture('api_client_authorizations')['anonymous']['api_token']
+    Rails.configuration.Users.AnonymousUserToken = api_fixture('api_client_authorizations')['anonymous']['api_token']
   end
 
   PUBLIC_PROJECT = "/projects/#{api_fixture('groups')['anonymously_accessible_project']['uuid']}"
@@ -35,7 +33,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         assert_text 'indicate that you have read and accepted the user agreement'
       end
       within('.navbar-fixed-top') do
-        assert_selector 'a', text: Rails.configuration.site_name.downcase
+        assert_selector 'a', text: Rails.configuration.Workbench.SiteName.downcase
         assert(page.has_link?("notifications-menu"), 'no user menu')
         page.find("#notifications-menu").click
         within('.dropdown-menu') do
@@ -45,8 +43,8 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
     else  # anonymous
       assert_text 'Unrestricted public data'
       within('.navbar-fixed-top') do
-        assert_text Rails.configuration.site_name.downcase
-        assert_no_selector 'a', text: Rails.configuration.site_name.downcase
+        assert_text Rails.configuration.Workbench.SiteName.downcase
+        assert_no_selector 'a', text: Rails.configuration.Workbench.SiteName.downcase
         assert_selector 'a', text: 'Log in'
         assert_selector 'a', text: 'Browse public projects'
       end
@@ -119,20 +117,10 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
   end
 
   test 'view file' do
-    use_keep_web_config
-
+    need_selenium "phantomjs does not follow redirects reliably, maybe https://github.com/ariya/phantomjs/issues/10389"
     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
@@ -209,7 +197,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         assert_text 'script version'
         assert_no_selector 'a', text: 'Run this pipeline'
       else
-        within first('tr[data-kind="arvados#workflow"]') do
+        within 'tr[data-kind="arvados#workflow"]', text: "Workflow with default input specifications" do
           click_link 'Show'
         end
 
@@ -268,7 +256,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 +271,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 +279,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