Merge branch 'pull/4985'

[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 10419c0f814b2e8b240cb80b3263b2f85857a7dd..5e8396c676ac754543f5e08c27b5d82045b33e52 100644 (file)
--- a/test/abilities/api_capability_test.rb
+++ b/test/abilities/api_capability_test.rb
@@ -4,7 +4,7 @@ require "test_helper"
 
 class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
   test "as a normal user with permissionless token" do
 
 class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
   test "as a normal user with permissionless token" do

-    token = create(:access_token)
+    token = create(:oauth_access_token)

     capability = ApiCapability.new token
 
     [:create, :destroy, :restore].each do |action|
     capability = ApiCapability.new token
 
     [:create, :destroy, :restore].each do |action|


@@ -12,8 +12,8 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
     end
   end
 
     end
   end
 

-  test "as a normal user with allow_write_api token" do
-    token = create(:access_token, :allow_write_api => true)
+  test "as a normal user with write_api token" do
+    token = create(:oauth_access_token, :scopes => %w[write_api])

     capability = ApiCapability.new token
 
     [:destroy, :restore].each do |action|
     capability = ApiCapability.new token
 
     [:destroy, :restore].each do |action|


@@ -26,7 +26,7 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
   end
 
   test "as a moderator with permissionless token" do
   end
 
   test "as a moderator with permissionless token" do

-    token = create(:access_token, :user => create(:moderator_user))
+    token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id)

     capability = ApiCapability.new token
 
     [:create, :destroy, :restore].each do |action|
     capability = ApiCapability.new token
 
     [:create, :destroy, :restore].each do |action|


@@ -34,8 +34,8 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
     end
   end
 
     end
   end
 

-  test "as a moderator with allow_write_api token" do
-    token = create(:access_token, :user => create(:moderator_user), :allow_write_api => true)
+  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
 
     [:create, :destroy, :restore].each do |action|
     capability = ApiCapability.new token
 
     [:create, :destroy, :restore].each do |action|


@@ -46,7 +46,7 @@ end
 
 class NoteApiCapabilityTest < ActiveSupport::TestCase
   test "as a normal user with permissionless token" do
 
 class NoteApiCapabilityTest < ActiveSupport::TestCase
   test "as a normal user with permissionless token" do

-    token = create(:access_token)
+    token = create(:oauth_access_token)

     capability = ApiCapability.new token
 
     [:create, :comment, :close, :reopen, :destroy].each do |action|
     capability = ApiCapability.new token
 
     [:create, :comment, :close, :reopen, :destroy].each do |action|


@@ -54,8 +54,8 @@ class NoteApiCapabilityTest < ActiveSupport::TestCase
     end
   end
 
     end
   end
 

-  test "as a normal user with allow_write_notes token" do
-    token = create(:access_token, :allow_write_notes => true)
+  test "as a normal user with write_notes token" do
+    token = create(:oauth_access_token, :scopes => %w[write_notes])

     capability = ApiCapability.new token
 
     [:destroy].each do |action|
     capability = ApiCapability.new token
 
     [:destroy].each do |action|


@@ -68,7 +68,7 @@ class NoteApiCapabilityTest < ActiveSupport::TestCase
   end
 
   test "as a moderator with permissionless token" do
   end
 
   test "as a moderator with permissionless token" do

-    token = create(:access_token, :user => create(:moderator_user))
+    token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id)

     capability = ApiCapability.new token
 
     [:destroy].each do |action|
     capability = ApiCapability.new token
 
     [:destroy].each do |action|


@@ -76,8 +76,8 @@ class NoteApiCapabilityTest < ActiveSupport::TestCase
     end
   end
 
     end
   end
 

-  test "as a moderator with allow_write_notes token" do
-    token = create(:access_token, :user => create(:moderator_user), :allow_write_notes => true)
+  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
 
     [:destroy].each do |action|
     capability = ApiCapability.new token
 
     [:destroy].each do |action|


@@ -88,21 +88,15 @@ end
 
 class UserApiCapabilityTest < ActiveSupport::TestCase
   test "user preferences" do
 
 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
     # A user with empty tokens

-    token = create(:access_token)
+    token = create(:oauth_access_token)

     capability = ApiCapability.new token
 
     [:index, :show, :update_all, :update, :destroy].each do |act|
       assert capability.cannot? act, UserPreference
     end
 
     capability = ApiCapability.new token
 
     [:index, :show, :update_all, :update, :destroy].each do |act|
       assert capability.cannot? act, UserPreference
     end
 

-    token = create(:access_token, :allow_read_prefs => true)
+    token = create(:oauth_access_token, :scopes => %w[read_prefs])

     capability = ApiCapability.new token
 
     [:update_all, :update, :destroy].each do |act|
     capability = ApiCapability.new token
 
     [:update_all, :update, :destroy].each do |act|


@@ -113,7 +107,7 @@ class UserApiCapabilityTest < ActiveSupport::TestCase
       assert capability.can? act, UserPreference
     end
 
       assert capability.can? act, UserPreference
     end
 

-    token = create(:access_token, :allow_write_prefs => true)
+    token = create(:oauth_access_token, :scopes => %w[write_prefs])

     capability = ApiCapability.new token
 
     [:index, :show].each do |act|
     capability = ApiCapability.new token
 
     [:index, :show].each do |act|