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

[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 80056d2ea073d2222e3d672d2a35b6ffd739db8a..73dd6258f255341bb0c298c689797ec9f91afb0e 100644 (file)
--- a/test/models/oauth_token_test.rb
+++ b/test/models/oauth_token_test.rb
@@ -1,25 +1,23 @@
-require 'test_helper'
+require "test_helper"

 
 class OauthTokenTest < ActiveSupport::TestCase
 
 class OauthTokenTest < ActiveSupport::TestCase

-  api_fixtures
-

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

-    assert_equal false, tok.invalidated?, "Token should be created valid."
+    assert_not_predicate tok, :invalidated?, "Token should be created valid."

     tok.invalidate!
     tok.invalidate!

-    assert_equal true, tok.invalidated?, "Token should now be invalid."
+    assert_predicate tok, :invalidated?, "Token should now be invalid."

   end
 
   ##
   # check that an authorized token is authorised and can be invalidated
   def test_token_authorisation
   end
 
   ##
   # check that an authorized token is authorised and can be invalidated
   def test_token_authorisation

-    tok = RequestToken.create(:client_application => client_applications(:oauth_web_app))
-    assert_equal false, tok.authorized?, "Token should be created unauthorised."
-    tok.authorize!(users(:public_user))
-    assert_equal true, tok.authorized?, "Token should now be authorised."
+    tok = RequestToken.create(:client_application => create(:client_application))
+    assert_not_predicate tok, :authorized?, "Token should be created unauthorised."
+    tok.authorize!(create(:user))
+    assert_predicate tok, :authorized?, "Token should now be authorised."

     tok.invalidate!
     tok.invalidate!

-    assert_equal false, tok.authorized?, "Token should now be invalid."
+    assert_not_predicate tok, :authorized?, "Token should now be invalid."

   end
 end
   end
 end