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

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

diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb
index cc981b792ceb6767fbe769a1238bf7ce03ab7667..99168375a884f62560ab732a84f54f2f6ec4c94b 100644 (file)
--- a/test/abilities/abilities_test.rb
+++ b/test/abilities/abilities_test.rb
@@ -45,7 +45,7 @@ class GuestAbilityTest < AbilityTest
   test "user roles permissions for a guest" do
     ability = Ability.new nil
 
   test "user roles permissions for a guest" do
     ability = Ability.new nil
 

-    [:grant, :revoke].each do |action|
+    [:create, :destroy].each do |action|

       assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles"
     end
   end
       assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles"
     end
   end


@@ -86,7 +86,7 @@ class ModeratorAbilityTest < AbilityTest
   test "User Roles permissions" do
     ability = Ability.new create(:moderator_user)
 
   test "User Roles permissions" do
     ability = Ability.new create(:moderator_user)
 

-    [:grant, :revoke].each do |action|
+    [:create, :destroy].each do |action|

       assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles"
     end
 
       assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles"
     end
 


@@ -95,6 +95,53 @@ class ModeratorAbilityTest < 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 "Active block update permissions" do
+    creator_user = create(:moderator_user)
+    other_moderator_user = create(:moderator_user)
+    block = create(:user_block, :creator => creator_user)
+
+    creator_ability = Ability.new creator_user
+    assert creator_ability.can?(:edit, block)
+    assert creator_ability.can?(:update, block)
+
+    other_moderator_ability = Ability.new other_moderator_user
+    assert other_moderator_ability.can?(:edit, block)
+    assert other_moderator_ability.can?(:update, block)
+  end
+
+  test "Expired block update permissions" do
+    creator_user = create(:moderator_user)
+    other_moderator_user = create(:moderator_user)
+    block = create(:user_block, :expired, :creator => creator_user)
+
+    creator_ability = Ability.new creator_user
+    assert creator_ability.can?(:edit, block)
+    assert creator_ability.can?(:update, block)
+
+    other_moderator_ability = Ability.new other_moderator_user
+    assert other_moderator_ability.cannot?(:edit, block)
+    assert other_moderator_ability.cannot?(:update, block)
+  end
+
+  test "Revoked block update permissions" do
+    creator_user = create(:moderator_user)
+    revoker_user = create(:moderator_user)
+    other_moderator_user = create(:moderator_user)
+    block = create(:user_block, :revoked, :creator => creator_user, :revoker => revoker_user)
+
+    creator_ability = Ability.new creator_user
+    assert creator_ability.can?(:edit, block)
+    assert creator_ability.can?(:update, block)
+
+    revoker_ability = Ability.new revoker_user
+    assert revoker_ability.can?(:edit, block)
+    assert revoker_ability.can?(:update, block)
+
+    other_moderator_ability = Ability.new other_moderator_user
+    assert other_moderator_ability.cannot?(:edit, block)
+    assert other_moderator_ability.cannot?(:update, block)
+  end

 end
 
 class AdministratorAbilityTest < AbilityTest
 end
 
 class AdministratorAbilityTest < AbilityTest


@@ -112,7 +159,7 @@ class AdministratorAbilityTest < AbilityTest
   test "User Roles permissions for an administrator" do
     ability = Ability.new create(:administrator_user)
 
   test "User Roles permissions for an administrator" do
     ability = Ability.new create(:administrator_user)
 

-    [:grant, :revoke].each do |action|
+    [:create, :destroy].each do |action|

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