[ARVADOS] updated: fa166d52969bb6f002fb62b554ef227194e0febe

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/controllers/application_controller_test.rb | 4 +++-
 apps/workbench/test/integration/anonymous_access_test.rb       | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

       via  fa166d52969bb6f002fb62b554ef227194e0febe (commit)
       via  74b859d9429c1f048f8e71a799d6a44ff3e870d7 (commit)
      from  970766e3167be72c1fe6abdc1609831721dbf62d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fa166d52969bb6f002fb62b554ef227194e0febe
Merge: 74b859d 970766e
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Feb 3 19:32:24 2015 -0500

    Merge branch '2659-anonymous-share-projects' of git.curoverse.com:arvados into 2659-anonymous-share-projects


commit 74b859d9429c1f048f8e71a799d6a44ff3e870d7
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Feb 3 19:31:01 2015 -0500

    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 9f52e9c..843cf88 100644
--- 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 0476820..0a85018 100644
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--