X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/91fc65a2e3ad47414344a6d5dc03cb5fb2a08ce1..41619593df7cf3e1751e06cc9285f911b6e91e11:/test/models/abilities_test.rb

diff --git a/test/models/abilities_test.rb b/test/models/abilities_test.rb
index 77c14f40f..be0b61af8 100644
--- a/test/models/abilities_test.rb
+++ b/test/models/abilities_test.rb
@@ -6,7 +6,6 @@ class AbilityTest < ActiveSupport::TestCase
 end
 
 class GuestAbilityTest < AbilityTest
-
   test "geocoder permission for a guest" do
     ability = Ability.new nil
 
@@ -18,7 +17,7 @@ class GuestAbilityTest < AbilityTest
 
   test "diary permissions for a guest" do
     ability = Ability.new nil
-    [:list, :rss, :view, :comments].each do |action|
+    [:index, :rss, :show, :comments].each do |action|
       assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries"
     end
 
@@ -27,15 +26,13 @@ class GuestAbilityTest < AbilityTest
       assert ability.cannot?(action, DiaryComment), "should be able to #{action} DiaryEntries"
     end
   end
-
 end
 
 class UserAbilityTest < AbilityTest
-
   test "Diary permissions" do
     ability = Ability.new create(:user)
 
-    [:list, :rss, :view, :comments, :create, :edit, :comment, :subscribe, :unsubscribe].each do |action|
+    [:index, :rss, :show, :comments, :create, :edit, :comment, :subscribe, :unsubscribe].each do |action|
       assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries"
     end
 
@@ -43,14 +40,27 @@ class UserAbilityTest < AbilityTest
       assert ability.cannot?(action, DiaryEntry), "should be able to #{action} DiaryEntries"
       assert ability.cannot?(action, DiaryComment), "should 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
 
-class AdministratorAbilityTest < AbilityTest
+class ModeratorAbilityTest < AbilityTest
+  test "Issue permissions" do
+    ability = Ability.new create(:moderator_user)
+
+    [:index, :show, :resolve, :ignore, :reopen].each do |action|
+      assert ability.can?(action, Issue), "should be able to #{action} Issues"
+    end
+  end
+end
 
+class AdministratorAbilityTest < AbilityTest
   test "Diary for an administrator" do
     ability = Ability.new create(:administrator_user)
-    [:list, :rss, :view, :comments, :create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|
+    [: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
 
@@ -58,14 +68,4 @@ class AdministratorAbilityTest < AbilityTest
       assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComment"
     end
   end
-
-  test "administrator does not auto-grant user preferences" do
-    ability = Ability.new create(:administrator_user)
-
-    [:read, :read_one, :update, :update_one, :delete_one].each do |act|
-      assert ability.cannot? act, UserPreference
-    end
-  end
-
-
 end