Use casecmp?() instead of casecmp().zero?

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

diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb
index 139f270feee4d274d402f84630632e6bbde1dc41..cc981b792ceb6767fbe769a1238bf7ce03ab7667 100644 (file)
--- a/test/abilities/abilities_test.rb
+++ b/test/abilities/abilities_test.rb
@@ -17,13 +17,21 @@ class GuestAbilityTest < AbilityTest
 
   test "diary permissions for a guest" do
     ability = Ability.new nil
 
   test "diary permissions for a guest" do
     ability = Ability.new nil

-    [:index, :rss, :show, :comments].each do |action|
+    [:index, :rss, :show].each do |action|

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

-    [:create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|
+    [:index].each do |action|
+      assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComments"
+    end
+
+    [:create, :edit, :subscribe, :unsubscribe, :hide, :unhide].each do |action|

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

+
+    [:create, :hide, :unhide].each do |action|
+      assert ability.cannot?(action, DiaryComment), "should not be able to #{action} DiaryComments"
+    end

   end
 
   test "note permissions for a guest" do
   end
 
   test "note permissions for a guest" do


@@ -47,12 +55,17 @@ class UserAbilityTest < AbilityTest
   test "Diary permissions" do
     ability = Ability.new create(:user)
 
   test "Diary permissions" do
     ability = Ability.new create(:user)
 

-    [:index, :rss, :show, :comments, :create, :edit, :comment, :subscribe, :unsubscribe].each do |action|
+    [:index, :rss, :show, :create, :edit, :subscribe, :unsubscribe].each do |action|

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

-    [:hide, :hidecomment].each do |action|
+    [:index, :create].each do |action|
+      assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComments"
+    end
+
+    [:hide, :unhide].each do |action|

       assert ability.cannot?(action, DiaryEntry), "should not be able to #{action} DiaryEntries"
       assert ability.cannot?(action, DiaryEntry), "should not be able to #{action} DiaryEntries"

+      assert ability.cannot?(action, DiaryComment), "should not be able to #{action} DiaryComment"

     end
 
     [:index, :show, :resolve, :ignore, :reopen].each do |action|
     end
 
     [:index, :show, :resolve, :ignore, :reopen].each do |action|


@@ -77,8 +90,9 @@ class ModeratorAbilityTest < AbilityTest
       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
 

-    [:hide, :hidecomment].each do |action|
+    [:hide, :unhide].each do |action|

       assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries"
       assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries"

+      assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComment"

     end
   end
 end
     end
   end
 end


@@ -86,9 +100,13 @@ end
 class AdministratorAbilityTest < AbilityTest
   test "Diary for an administrator" do
     ability = Ability.new create(:administrator_user)
 class AdministratorAbilityTest < AbilityTest
   test "Diary for an administrator" do
     ability = Ability.new create(:administrator_user)

-    [:index, :rss, :show, :comments, :create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|
+    [:index, :rss, :show, :create, :edit, :subscribe, :unsubscribe, :hide, :unhide].each do |action|

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

+
+    [:index, :create, :hide, :unhide].each do |action|
+      assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComments"
+    end

   end
 
   test "User Roles permissions for an administrator" do
   end
 
   test "User Roles permissions for an administrator" do