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

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

diff --git a/test/abilities/api_capability_test.rb b/test/abilities/api_capability_test.rb
index 8d0e682f62b4a3ac91b5b875e43c8d311f82c483..dccde57580db834fb2a7d81b3ecb34e073ffae0b 100644 (file)
--- a/test/abilities/api_capability_test.rb
+++ b/test/abilities/api_capability_test.rb
@@ -3,6 +3,8 @@
 require "test_helper"
 
 class ApiCapabilityTest < ActiveSupport::TestCase
 require "test_helper"
 
 class ApiCapabilityTest < ActiveSupport::TestCase

+  private
+

   def tokens(*toks)
     AccessToken.new do |token|
       toks.each do |t|
   def tokens(*toks)
     AccessToken.new do |token|
       toks.each do |t|


@@ -100,33 +102,33 @@ class UserApiCapabilityTest < ApiCapabilityTest
   test "user preferences" do
     # a user with no tokens
     capability = ApiCapability.new nil
   test "user preferences" do
     # a user with no tokens
     capability = ApiCapability.new nil

-    [:read, :read_one, :update, :update_one, :delete_one].each do |act|
+    [:index, :show, :update_all, :update, :destroy].each do |act|

       assert capability.cannot? act, UserPreference
     end
 
     # A user with empty tokens
     capability = ApiCapability.new tokens
 
       assert capability.cannot? act, UserPreference
     end
 
     # A user with empty tokens
     capability = ApiCapability.new tokens
 

-    [:read, :read_one, :update, :update_one, :delete_one].each do |act|
+    [:index, :show, :update_all, :update, :destroy].each do |act|

       assert capability.cannot? act, UserPreference
     end
 
     capability = ApiCapability.new tokens(:allow_read_prefs)
 
       assert capability.cannot? act, UserPreference
     end
 
     capability = ApiCapability.new tokens(:allow_read_prefs)
 

-    [:update, :update_one, :delete_one].each do |act|
+    [:update_all, :update, :destroy].each do |act|

       assert capability.cannot? act, UserPreference
     end
 
       assert capability.cannot? act, UserPreference
     end
 

-    [:read, :read_one].each do |act|
+    [:index, :show].each do |act|

       assert capability.can? act, UserPreference
     end
 
     capability = ApiCapability.new tokens(:allow_write_prefs)
       assert capability.can? act, UserPreference
     end
 
     capability = ApiCapability.new tokens(:allow_write_prefs)

-    [:read, :read_one].each do |act|
+    [:index, :show].each do |act|

       assert capability.cannot? act, UserPreference
     end
 
       assert capability.cannot? act, UserPreference
     end
 

-    [:update, :update_one, :delete_one].each do |act|
+    [:update_all, :update, :destroy].each do |act|

       assert capability.can? act, UserPreference
     end
   end
       assert capability.can? act, UserPreference
     end
   end