Merge pull request #4813 from AntonKhorev/no-fst-italic

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

diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb
index 99154b4b72cfaeb79ef35019ed4bdb0293f6c174..58ef2b5143b7373104825aaa69649b213f28203e 100644 (file)
--- a/test/abilities/abilities_test.rb
+++ b/test/abilities/abilities_test.rb
@@ -9,27 +9,35 @@ class GuestAbilityTest < AbilityTest
   test "geocoder permission for a guest" do
     ability = Ability.new nil
 
   test "geocoder permission for a guest" do
     ability = Ability.new nil
 

-    [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
-     :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse].each do |action|
+    [:search, :search_latlon, :search_osm_nominatim,
+     :search_osm_nominatim_reverse].each do |action|

       assert ability.can?(action, :geocoder), "should be able to #{action} geocoder"
     end
   end
 
   test "diary permissions for a guest" do
     ability = Ability.new nil
       assert ability.can?(action, :geocoder), "should be able to #{action} geocoder"
     end
   end
 
   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, :comment, :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

+
+    [: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
     ability = Ability.new nil
 
   end
 
   test "note permissions for a guest" do
     ability = Ability.new nil
 

-    [:mine].each do |action|
+    [:index].each do |action|

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


@@ -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, :comment, :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].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, :comment, :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, :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