Change abilities based on upstream renamings

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

diff --git a/test/models/abilities_test.rb b/test/models/abilities_test.rb
index 77c14f40f5fb30498a01adf78ea95f973c54ee7c..be659af4a45c3baaad3a054f2bfeee02669e13b3 100644 (file)
--- 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
 
@@ -47,10 +44,9 @@ class UserAbilityTest < AbilityTest
 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
 
@@ -66,6 +62,4 @@ class AdministratorAbilityTest < AbilityTest
       assert ability.cannot? act, UserPreference
     end
   end
-
-
 end