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

[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 bcfcaf74e4d809ad0a8aba72af5c0837f8af062d..8f5272c50b6a95b25a02ca0f90dd2efe7608a57f 100644 (file)
--- a/test/abilities/api_capability_test.rb
+++ b/test/abilities/api_capability_test.rb
@@ -5,41 +5,41 @@ require "test_helper"
 class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
   test "as a normal user with permissionless token" do
     token = create(:oauth_access_token)
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:create, :destroy, :restore].each do |action|
-      assert capability.cannot? action, ChangesetComment
+      assert ability.cannot? action, ChangesetComment
     end
   end
 
   test "as a normal user with write_api token" do
     token = create(:oauth_access_token, :scopes => %w[write_api])
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:destroy, :restore].each do |action|
-      assert capability.cannot? action, ChangesetComment
+      assert ability.cannot? action, ChangesetComment
     end
 
     [:create].each do |action|
-      assert capability.can? action, ChangesetComment
+      assert ability.can? action, ChangesetComment
     end
   end
 
   test "as a moderator with permissionless token" do
     token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id)
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:create, :destroy, :restore].each do |action|
-      assert capability.cannot? action, ChangesetComment
+      assert ability.cannot? action, ChangesetComment
     end
   end
 
   test "as a moderator with write_api token" do
     token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id, :scopes => %w[write_api])
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:create, :destroy, :restore].each do |action|
-      assert capability.can? action, ChangesetComment
+      assert ability.can? action, ChangesetComment
     end
   end
 end
@@ -47,81 +47,75 @@ end
 class NoteApiCapabilityTest < ActiveSupport::TestCase
   test "as a normal user with permissionless token" do
     token = create(:oauth_access_token)
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:create, :comment, :close, :reopen, :destroy].each do |action|
-      assert capability.cannot? action, Note
+      assert ability.cannot? action, Note
     end
   end
 
   test "as a normal user with write_notes token" do
     token = create(:oauth_access_token, :scopes => %w[write_notes])
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:destroy].each do |action|
-      assert capability.cannot? action, Note
+      assert ability.cannot? action, Note
     end
 
     [:create, :comment, :close, :reopen].each do |action|
-      assert capability.can? action, Note
+      assert ability.can? action, Note
     end
   end
 
   test "as a moderator with permissionless token" do
     token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id)
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:destroy].each do |action|
-      assert capability.cannot? action, Note
+      assert ability.cannot? action, Note
     end
   end
 
   test "as a moderator with write_notes token" do
     token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id, :scopes => %w[write_notes])
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:destroy].each do |action|
-      assert capability.can? action, Note
+      assert ability.can? action, Note
     end
   end
 end
 
 class UserApiCapabilityTest < ActiveSupport::TestCase
   test "user preferences" do
-    # a user with no tokens
-    capability = ApiCapability.new nil
-    [:index, :show, :update_all, :update, :destroy].each do |act|
-      assert capability.cannot? act, UserPreference
-    end
-
     # A user with empty tokens
     token = create(:oauth_access_token)
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:index, :show, :update_all, :update, :destroy].each do |act|
-      assert capability.cannot? act, UserPreference
+      assert ability.cannot? act, UserPreference
     end
 
     token = create(:oauth_access_token, :scopes => %w[read_prefs])
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:update_all, :update, :destroy].each do |act|
-      assert capability.cannot? act, UserPreference
+      assert ability.cannot? act, UserPreference
     end
 
     [:index, :show].each do |act|
-      assert capability.can? act, UserPreference
+      assert ability.can? act, UserPreference
     end
 
     token = create(:oauth_access_token, :scopes => %w[write_prefs])
-    capability = ApiCapability.new token
+    ability = ApiAbility.new token
 
     [:index, :show].each do |act|
-      assert capability.cannot? act, UserPreference
+      assert ability.cannot? act, UserPreference
     end
 
     [:update_all, :update, :destroy].each do |act|
-      assert capability.can? act, UserPreference
+      assert ability.can? act, UserPreference
     end
   end
 end