2659: tests do not "assume" that anonymous configuration is enabled.

diff --git a/apps/workbench/test/controllers/application_controller_test.rb b/apps/workbench/test/controllers/application_controller_test.rb
index 9f52e9c5e2224a9bf8bb09704a5ceeb1fb293f3e..843cf88a3d8185d4f96ddd189c61ef48adf28ef0 100644 (file)
--- a/apps/workbench/test/controllers/application_controller_test.rb
+++ b/apps/workbench/test/controllers/application_controller_test.rb
@@ -339,7 +339,9 @@ class ApplicationControllerTest < ActionController::TestCase
     [ProjectsController.new, api_fixture('groups')['anonymously_accessible_project'], false],
   ].each do |controller, fixture, anon_config=true|
     test "#{controller} show method with anonymous config enabled" do
-      if !anon_config
+      if anon_config
+        Rails.configuration.anonymous_user_token = api_fixture('api_client_authorizations')['anonymous']['api_token']
+      else
         Rails.configuration.anonymous_user_token = false
       end
 

diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index 0476820035d7ec996ca32ec10649a8e946465448..0a850188df6656c2afdc85e7d01e15b7ddb20ab8 100644 (file)
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -8,6 +8,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
 
   setup do
     need_javascript
+    Rails.configuration.anonymous_user_token = api_fixture('api_client_authorizations')['anonymous']['api_token']
   end
 
   PUBLIC_PROJECT = "/projects/#{api_fixture('groups')['anonymously_accessible_project']['uuid']}"
@@ -170,4 +171,10 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
     assert_text 'script version'
     assert_no_selector 'a', text: 'Run this pipeline'
   end
+
+  test "visit public project as anonymous when anonymous browsing is not enabled and expect login page" do
+    Rails.configuration.anonymous_user_token = false
+    visit "/projects/#{api_fixture('groups')['aproject']['uuid']}"
+    assert_text 'Please log in'
+  end
 end