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

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

diff --git a/test/abilities/api_abilities_test.rb b/test/abilities/api_abilities_test.rb
index 8ddc54561c52b93b7110fc75681b471810f8ac1d..a68704f1ae7f1698d525f33118b54fcd8728eb47 100644 (file)
--- a/test/abilities/api_abilities_test.rb
+++ b/test/abilities/api_abilities_test.rb
@@ -21,7 +21,8 @@ end
 
 class UserApiAbilityTest < ApiAbilityTest
   test "Note permissions" do
 
 class UserApiAbilityTest < ApiAbilityTest
   test "Note permissions" do

-    ability = ApiAbility.new create(:user)
+    token = create(:oauth_access_token, :scopes => %w[write_notes])
+    ability = ApiAbility.new token

 
     [:index, :create, :comment, :feed, :show, :search, :close, :reopen].each do |action|
       assert ability.can?(action, Note), "should be able to #{action} Notes"
 
     [:index, :create, :comment, :feed, :show, :search, :close, :reopen].each do |action|
       assert ability.can?(action, Note), "should be able to #{action} Notes"


@@ -35,7 +36,8 @@ end
 
 class ModeratorApiAbilityTest < ApiAbilityTest
   test "Note permissions" do
 
 class ModeratorApiAbilityTest < ApiAbilityTest
   test "Note permissions" do

-    ability = ApiAbility.new create(:moderator_user)
+    token = create(:oauth_access_token, :scopes => %w[write_notes], :resource_owner_id => create(:moderator_user).id)
+    ability = ApiAbility.new token

 
     [:index, :create, :comment, :feed, :show, :search, :close, :reopen, :destroy].each do |action|
       assert ability.can?(action, Note), "should be able to #{action} Notes"
 
     [:index, :create, :comment, :feed, :show, :search, :close, :reopen, :destroy].each do |action|
       assert ability.can?(action, Note), "should be able to #{action} Notes"