X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/50542359e38f9963ff6864c919e94edb286d69d8..23138fc621581634579294751beeff7f5e66358e:/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 8d772b087f..0842635f60 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,8 +117,6 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest end test 'view file' do - use_keep_web_config - magic = rand(2**512).to_s 36 owner = api_fixture('groups')['anonymously_accessible_project']['uuid'] col = upload_data_and_get_collection(magic, 'admin', "Hello\\040world.txt", owner)