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 5e8396c676ac754543f5e08c27b5d82045b33e52..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)
 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|
 
     [: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])
     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|
 
     [:destroy, :restore].each do |action|

-      assert capability.cannot? action, ChangesetComment
+      assert ability.cannot? action, ChangesetComment

     end
 
     [:create].each do |action|
     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)
     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|
 
     [: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])
     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|
 
     [:create, :destroy, :restore].each do |action|

-      assert capability.can? action, ChangesetComment
+      assert ability.can? action, ChangesetComment

     end
   end
 end
     end
   end
 end


@@ -47,41 +47,41 @@ end
 class NoteApiCapabilityTest < ActiveSupport::TestCase
   test "as a normal user with permissionless token" do
     token = create(:oauth_access_token)
 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|
 
     [: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])
     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|
 
     [:destroy].each do |action|

-      assert capability.cannot? action, Note
+      assert ability.cannot? action, Note

     end
 
     [:create, :comment, :close, :reopen].each do |action|
     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)
     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|
 
     [: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])
     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|
 
     [:destroy].each do |action|

-      assert capability.can? action, Note
+      assert ability.can? action, Note

     end
   end
 end
     end
   end
 end


@@ -90,32 +90,32 @@ class UserApiCapabilityTest < ActiveSupport::TestCase
   test "user preferences" do
     # A user with empty tokens
     token = create(:oauth_access_token)
   test "user preferences" do
     # 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|
 
     [: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])
     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|
 
     [:update_all, :update, :destroy].each do |act|

-      assert capability.cannot? act, UserPreference
+      assert ability.cannot? act, UserPreference

     end
 
     [:index, :show].each do |act|
     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])
     end
 
     token = create(:oauth_access_token, :scopes => %w[write_prefs])

-    capability = ApiCapability.new token
+    ability = ApiAbility.new token

 
     [:index, :show].each do |act|
 
     [:index, :show].each do |act|

-      assert capability.cannot? act, UserPreference
+      assert ability.cannot? act, UserPreference

     end
 
     [:update_all, :update, :destroy].each do |act|
     end
 
     [:update_all, :update, :destroy].each do |act|

-      assert capability.can? act, UserPreference
+      assert ability.can? act, UserPreference

     end
   end
 end
     end
   end
 end