From: Tom Hughes <tom@compton.nu>
Date: Thu, 29 Dec 2022 16:51:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3862'
X-Git-Tag: live~971
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/07fe77b4fcfbbfd582da7b257c024b55accba705?hp=f99e028e42c12ad7158160724232eae2b4aef381

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

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 72e1ca5d9..50615233f 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -258,4 +258,28 @@ class UserTest < ActiveSupport::TestCase
     assert_not user.visible?
     assert_not user.active?
   end
+
+  def test_soft_destroy_revokes_access_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_oauth_access_tokens
+    user = create(:user)
+    oauth_access_token = create(:oauth_access_token, :resource_owner_id => user.id)
+    assert_equal 1, user.access_tokens.not_expired.count
+
+    user.soft_destroy
+
+    assert_equal 0, user.access_tokens.not_expired.count
+    oauth_access_token.reload
+    assert_predicate oauth_access_token, :revoked?
+  end
 end