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

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

diff --git a/test/models/oauth_nonce_test.rb b/test/models/oauth_nonce_test.rb
index dd97278c132415ad50040705191d90dd87685161..56178fb5fc63fb48cbe215e2c21be38f3d25d74e 100644 (file)
--- a/test/models/oauth_nonce_test.rb
+++ b/test/models/oauth_nonce_test.rb
@@ -12,7 +12,7 @@ class OauthNonceTest < ActiveSupport::TestCase
     assert_not_equal false, nonce1, "First nonce should be unique. Check your test database is empty."
 
     nonce2 = OauthNonce.remember(string, timestamp)
     assert_not_equal false, nonce1, "First nonce should be unique. Check your test database is empty."
 
     nonce2 = OauthNonce.remember(string, timestamp)

-    assert_equal false, nonce2, "Shouldn't be able to remember the same nonce twice."
+    assert_not nonce2, "Shouldn't be able to remember the same nonce twice."

   end
 
   ##
   end
 
   ##


@@ -21,7 +21,7 @@ class OauthNonceTest < ActiveSupport::TestCase
     string = "0123456789ABCDEF"
 
     nonce1 = OauthNonce.remember(string, Time.now.to_i - 86430)
     string = "0123456789ABCDEF"
 
     nonce1 = OauthNonce.remember(string, Time.now.to_i - 86430)

-    assert_equal false, nonce1, "Nonces over a day in the past should be rejected"
+    assert_not nonce1, "Nonces over a day in the past should be rejected"

 
     nonce2 = OauthNonce.remember(string, Time.now.to_i - 86370)
     assert_not_equal false, nonce2, "Nonces under a day in the past should be rejected"
 
     nonce2 = OauthNonce.remember(string, Time.now.to_i - 86370)
     assert_not_equal false, nonce2, "Nonces under a day in the past should be rejected"