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

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

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 10fd3d97ec9cb533494e72946a049def4c936620..6836c4f70a0fc81e15215ce5fbb445723b8c69b1 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -304,18 +304,6 @@ class UserTest < ActiveSupport::TestCase
     assert_not_predicate user, :active?
   end
 
     assert_not_predicate user, :active?
   end
 

-  def test_soft_destroy_revokes_oauth1_tokens
-    user = create(:user)
-    access_token = create(:access_token, :user => user)
-    assert_equal 1, user.oauth_tokens.authorized.count
-
-    user.soft_destroy
-
-    assert_equal 0, user.oauth_tokens.authorized.count
-    access_token.reload
-    assert_predicate access_token, :invalidated?
-  end
-

   def test_soft_destroy_revokes_oauth2_tokens
     user = create(:user)
     oauth_access_token = create(:oauth_access_token, :resource_owner_id => user.id)
   def test_soft_destroy_revokes_oauth2_tokens
     user = create(:user)
     oauth_access_token = create(:oauth_access_token, :resource_owner_id => user.id)