X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a790c47923ae5722743ba168eb79f3beabe8a71e..5d1bc7a4fa3f21db35ca95292ec9a383476c3843:/test/abilities/abilities_test.rb?ds=inline

diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb
index 9444a45f5..139f270fe 100644
--- 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
 
-    [: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
@@ -23,19 +23,22 @@ 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"
-      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
 
-    [: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
+  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
@@ -50,25 +53,12 @@ class UserAbilityTest < AbilityTest
 
     [: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
-
-  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
@@ -80,11 +70,15 @@ class ModeratorAbilityTest < AbilityTest
     end
   end
 
-  test "Note permissions" do
+  test "User Roles 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"
+    [: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
@@ -95,9 +89,13 @@ 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
+  end
 
-    [:hide, :hidecomment].each do |action|
-      assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComment"
+  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