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

[rails.git] / test / models / oauth_token_test.rb

diff --git a/test/models/oauth_token_test.rb b/test/models/oauth_token_test.rb
index c2df0d1311b1e83e4a9434656920d31f61d935a7..4b0e39e9a59f97d776e4e59cd331ad670485df0d 100644 (file)
--- a/test/models/oauth_token_test.rb
+++ b/test/models/oauth_token_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class OauthTokenTest < ActiveSupport::TestCase
 require "test_helper"
 
 class OauthTokenTest < ActiveSupport::TestCase

-  api_fixtures
-

   ##
   # check that after calling invalidate! on a token, it is invalid.
   def test_token_invalidation
   ##
   # check that after calling invalidate! on a token, it is invalid.
   def test_token_invalidation


@@ -17,7 +15,7 @@ class OauthTokenTest < ActiveSupport::TestCase
   def test_token_authorisation
     tok = RequestToken.create(:client_application => create(:client_application))
     assert_equal false, tok.authorized?, "Token should be created unauthorised."
   def test_token_authorisation
     tok = RequestToken.create(:client_application => create(:client_application))
     assert_equal false, tok.authorized?, "Token should be created unauthorised."

-    tok.authorize!(users(:public_user))
+    tok.authorize!(create(:user))

     assert_equal true, tok.authorized?, "Token should now be authorised."
     tok.invalidate!
     assert_equal false, tok.authorized?, "Token should now be invalid."
     assert_equal true, tok.authorized?, "Token should now be authorised."
     tok.invalidate!
     assert_equal false, tok.authorized?, "Token should now be invalid."