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

[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 8a98f29e0e6274c6c871e57bbc9b697a1aa6666a..10419c0f814b2e8b240cb80b3263b2f85857a7dd 100644 (file)
--- a/test/abilities/api_capability_test.rb
+++ b/test/abilities/api_capability_test.rb
@@ -2,17 +2,7 @@
 
 require "test_helper"
 
 
 require "test_helper"
 

-class ApiCapabilityTest < ActiveSupport::TestCase
-  def tokens(*toks)
-    AccessToken.new do |token|
-      toks.each do |t|
-        token.public_send("#{t}=", true)
-      end
-    end
-  end
-end
-
-class ChangesetCommentApiCapabilityTest < ApiCapabilityTest
+class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase

   test "as a normal user with permissionless token" do
     token = create(:access_token)
     capability = ApiCapability.new token
   test "as a normal user with permissionless token" do
     token = create(:access_token)
     capability = ApiCapability.new token


@@ -54,7 +44,7 @@ class ChangesetCommentApiCapabilityTest < ApiCapabilityTest
   end
 end
 
   end
 end
 

-class NoteApiCapabilityTest < ApiCapabilityTest
+class NoteApiCapabilityTest < ActiveSupport::TestCase

   test "as a normal user with permissionless token" do
     token = create(:access_token)
     capability = ApiCapability.new token
   test "as a normal user with permissionless token" do
     token = create(:access_token)
     capability = ApiCapability.new token


@@ -96,7 +86,7 @@ class NoteApiCapabilityTest < ApiCapabilityTest
   end
 end
 
   end
 end
 

-class UserApiCapabilityTest < ApiCapabilityTest
+class UserApiCapabilityTest < ActiveSupport::TestCase

   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


@@ -105,13 +95,15 @@ class UserApiCapabilityTest < ApiCapabilityTest
     end
 
     # A user with empty tokens
     end
 
     # A user with empty tokens

-    capability = ApiCapability.new tokens
+    token = create(:access_token)
+    capability = ApiCapability.new token

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

-    capability = ApiCapability.new tokens(:allow_read_prefs)
+    token = create(:access_token, :allow_read_prefs => true)
+    capability = ApiCapability.new token

 
     [:update_all, :update, :destroy].each do |act|
       assert capability.cannot? act, UserPreference
 
     [:update_all, :update, :destroy].each do |act|
       assert capability.cannot? act, UserPreference


@@ -121,7 +113,9 @@ class UserApiCapabilityTest < ApiCapabilityTest
       assert capability.can? act, UserPreference
     end
 
       assert capability.can? act, UserPreference
     end
 

-    capability = ApiCapability.new tokens(:allow_write_prefs)
+    token = create(:access_token, :allow_write_prefs => true)
+    capability = ApiCapability.new token
+

     [:index, :show].each do |act|
       assert capability.cannot? act, UserPreference
     end
     [:index, :show].each do |act|
       assert capability.cannot? act, UserPreference
     end