[ARVADOS] updated: 56714c8df2f49a5b28ded29402d1af0cb3e45ba1

[git at public.curoverse.com]

Summary of changes:
 .../controllers/application_controller_test.rb     | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

       via  56714c8df2f49a5b28ded29402d1af0cb3e45ba1 (commit)
      from  60789154369c7a882561dbecff466787acfef6d5 (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 56714c8df2f49a5b28ded29402d1af0cb3e45ba1
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Feb 3 18:20:41 2015 -0500

    2659: add test cases where anonymous config is turned off for collections, jobs, pipeline instances, templates, and projects controller show method.

diff --git a/apps/workbench/test/controllers/application_controller_test.rb b/apps/workbench/test/controllers/application_controller_test.rb
index f48bdb6..9f52e9c 100644
--- a/apps/workbench/test/controllers/application_controller_test.rb
+++ b/apps/workbench/test/controllers/application_controller_test.rb
@@ -328,21 +328,35 @@ class ApplicationControllerTest < ActionController::TestCase
 
   [
     [CollectionsController.new, api_fixture('collections')['user_agreement_in_anonymously_accessible_project']],
+    [CollectionsController.new, api_fixture('collections')['user_agreement_in_anonymously_accessible_project'], false],
     [JobsController.new, api_fixture('jobs')['running_job_in_publicly_accessible_project']],
+    [JobsController.new, api_fixture('jobs')['running_job_in_publicly_accessible_project'], false],
     [PipelineInstancesController.new, api_fixture('pipeline_instances')['pipeline_in_publicly_accessible_project']],
+    [PipelineInstancesController.new, api_fixture('pipeline_instances')['pipeline_in_publicly_accessible_project'], false],
     [PipelineTemplatesController.new, api_fixture('pipeline_templates')['pipeline_template_in_publicly_accessible_project']],
+    [PipelineTemplatesController.new, api_fixture('pipeline_templates')['pipeline_template_in_publicly_accessible_project'], false],
     [ProjectsController.new, api_fixture('groups')['anonymously_accessible_project']],
-  ].each do |controller, fixture|
+    [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
+        Rails.configuration.anonymous_user_token = false
+      end
+
       @controller = controller
 
       get(:show, {id: fixture['uuid']})
 
-      assert_response 200
-      if controller.class == JobsController
-        assert_includes @response.inspect, fixture['script']
+      if anon_config
+        assert_response 200
+        if controller.class == JobsController
+          assert_includes @response.inspect, fixture['script']
+        else
+          assert_includes @response.inspect, fixture['name']
+        end
       else
-        assert_includes @response.inspect, fixture['name']
+        assert_response :redirect
+        assert_match /\/users\/welcome/, @response.redirect_url
       end
     end
   end

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


hooks/post-receive
--