Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/services/personal_access_tokens/revoke_token_family_service_spec.rb b/spec/services/personal_access_tokens/revoke_token_family_service_spec.rb
index 3e32200cc77..8a66efb1585 100644
--- a/spec/services/personal_access_tokens/revoke_token_family_service_spec.rb
+++ b/spec/services/personal_access_tokens/revoke_token_family_service_spec.rb
@@ -14,5 +14,12 @@ RSpec.describe PersonalAccessTokens::RevokeTokenFamilyService, feature_category:
       expect(response).to be_success
       expect(token_1.reload).to be_revoked
     end
+
+    it 'does not revoke any active token not in the pat family' do
+      unrelated_token = create(:personal_access_token)
+
+      expect(response).to be_success
+      expect(unrelated_token.reload).to be_active
+    end
   end
 end