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

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

diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb
index b951e23e5b68b0b5fcfcb3e4f22a6dd04c0ec09b..139f270feee4d274d402f84630632e6bbde1dc41 100644 (file)
--- a/test/abilities/abilities_test.rb
+++ b/test/abilities/abilities_test.rb
@@ -9,8 +9,8 @@ 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
       assert ability.can?(action, :geocoder), "should be able to #{action} geocoder"
     end
   end


@@ -23,20 +23,15 @@ class GuestAbilityTest < AbilityTest
 
     [:create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|
       assert ability.cannot?(action, DiaryEntry), "should not be able to #{action} DiaryEntries"
 
     [:create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|
       assert ability.cannot?(action, DiaryEntry), "should not be able to #{action} DiaryEntries"

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

     end
   end
 
   test "note permissions for a guest" do
     ability = Ability.new nil
 
     end
   end
 
   test "note permissions for a guest" do
     ability = Ability.new nil
 

-    [:index, :create, :comment, :feed, :show, :search, :mine].each do |action|
+    [:index].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

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

   end
 
   test "user roles permissions for a guest" do
   end
 
   test "user roles permissions for a guest" do


@@ -58,25 +53,12 @@ class UserAbilityTest < AbilityTest
 
     [:hide, :hidecomment].each do |action|
       assert ability.cannot?(action, DiaryEntry), "should not be able to #{action} DiaryEntries"
 
     [:hide, :hidecomment].each do |action|
       assert ability.cannot?(action, DiaryEntry), "should not be able to #{action} DiaryEntries"

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

     end
 
     [:index, :show, :resolve, :ignore, :reopen].each do |action|
       assert ability.cannot?(action, Issue), "should not be able to #{action} Issues"
     end
   end
     end
 
     [:index, :show, :resolve, :ignore, :reopen].each do |action|
       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


@@ -88,20 +70,16 @@ class ModeratorAbilityTest < AbilityTest
     end
   end
 
     end
   end
 

-  test "Note permissions" do
-    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"
-    end
-  end
-

   test "User Roles permissions" do
     ability = Ability.new create(:moderator_user)
 
     [:grant, :revoke].each do |action|
       assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles"
     end
   test "User Roles permissions" do
     ability = Ability.new create(:moderator_user)
 
     [:grant, :revoke].each do |action|
       assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles"
     end

+
+    [:hide, :hidecomment].each do |action|
+      assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries"
+    end

   end
 end
 
   end
 end
 


@@ -111,10 +89,6 @@ class AdministratorAbilityTest < AbilityTest
     [:index, :rss, :show, :comments, :create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|
       assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries"
     end
     [:index, :rss, :show, :comments, :create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|
       assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries"
     end

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

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