Bug 1103131: Let users search for global teams they are a member of

broker/test/functional/teams_controller_test.rb

@@ -50,10 +50,30 @@ def teardown
     assert_equal member_team.id.to_s, json['data'][0]['id'], json['data'][0].inspect
   end
 
-  test "global search requires capability" do
+  test "searching global team requires capability" do
+    @teams_to_tear_down << (non_member_team = Team.create(name: "global-team-non-member-#{@random}"))
+
     CloudUser.any_instance.stubs(:view_global_teams).returns(false)
     get :index, {"search" => "team", "global" => true}
-    assert_response :forbidden
+    assert_response :success
+    assert json = JSON.parse(response.body)
+    assert_equal [], json['data'], response.body
+  end
+
+  test "searching global member team does not require capability" do
+    @teams_to_tear_down << (member_team = Team.create(name: "global-team-member-#{@random}"))
+    @teams_to_tear_down << (non_member_team = Team.create(name: "global-team-non-member-#{@random}"))
+
+    member_team.add_members @user
+    member_team.save
+    member_team.run_jobs
+
+    CloudUser.any_instance.stubs(:view_global_teams).returns(false)
+    get :index, {"search" => "team", "global" => true}
+    assert_response :success
+    assert json = JSON.parse(response.body)
+    assert_equal 1, json['data'].length, response.body
+    assert_equal member_team.id.to_s, json['data'][0]['id'], json['data'][0].inspect
   end
 
   test "viewing global team requires capability" do

controller/app/controllers/teams_controller.rb

@@ -12,7 +12,6 @@ def index
 
     if search
       if get_bool(global)
-        authorize! :view_global_teams, current_user
         teams = Team.accessible(current_user).where(owner_id: nil, name: /.*#{Regexp.escape(search)}.*/i).sort({name: 1})
       else
         teams = Team.accessible(current_user).where(:owner_id.exists => true, :owner_id.ne => "", name: /.*#{Regexp.escape(search)}.*/i).sort({name: 1})