Merge remote-tracking branch 'upstream/pull/2256'

[rails.git] / test / abilities / abilities_test.rb

diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb
index 9444a45f5ecee1f71eaecad118ea44670f970610..f43b6bf50de811b2f5b5fcc66fdca7d82e99b299 100644 (file)
--- a/test/abilities/abilities_test.rb
+++ b/test/abilities/abilities_test.rb
@@ -30,12 +30,16 @@ class GuestAbilityTest < AbilityTest
   test "note permissions for a guest" do
     ability = Ability.new nil
 
   test "note permissions for a guest" do
     ability = Ability.new nil
 

-    [:index, :create, :comment, :feed, :show, :search, :mine].each do |action|
+    [:mine].each do |action|

       assert ability.can?(action, Note), "should be able to #{action} Notes"
     end
       assert ability.can?(action, Note), "should be able to #{action} Notes"
     end

+  end
+
+  test "user roles permissions for a guest" do
+    ability = Ability.new nil

 
 

-    [:close, :reopen, :destroy].each do |action|
-      assert ability.cannot?(action, Note), "should not be able to #{action} Notes"
+    [:grant, :revoke].each do |action|
+      assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles"

     end
   end
 end
     end
   end
 end


@@ -57,18 +61,6 @@ class UserAbilityTest < AbilityTest
       assert ability.cannot?(action, Issue), "should not be able to #{action} Issues"
     end
   end
       assert ability.cannot?(action, Issue), "should not be able to #{action} Issues"
     end
   end

-
-  test "Note permissions" do
-    ability = Ability.new create(:user)
-
-    [:index, :create, :comment, :feed, :show, :search, :mine, :close, :reopen].each do |action|
-      assert ability.can?(action, Note), "should be able to #{action} Notes"
-    end
-
-    [:destroy].each do |action|
-      assert ability.cannot?(action, Note), "should not be able to #{action} Notes"
-    end
-  end

 end
 
 class ModeratorAbilityTest < AbilityTest
 end
 
 class ModeratorAbilityTest < AbilityTest


@@ -80,11 +72,11 @@ class ModeratorAbilityTest < AbilityTest
     end
   end
 
     end
   end
 

-  test "Note permissions" do
+  test "User Roles permissions" do

     ability = Ability.new create(:moderator_user)
 
     ability = Ability.new create(:moderator_user)
 

-    [:index, :create, :comment, :feed, :show, :search, :mine, :close, :reopen, :destroy].each do |action|
-      assert ability.can?(action, Note), "should be able to #{action} Notes"
+    [:grant, :revoke].each do |action|
+      assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles"

     end
   end
 end
     end
   end
 end


@@ -100,4 +92,12 @@ class AdministratorAbilityTest < AbilityTest
       assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComment"
     end
   end
       assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComment"
     end
   end

+
+  test "User Roles permissions for an administrator" do
+    ability = Ability.new create(:administrator_user)
+
+    [:grant, :revoke].each do |action|
+      assert ability.can?(action, UserRole), "should be able to #{action} UserRoles"
+    end
+  end

 end
 end