Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 26 insertions, 0 deletions

diff --git a/spec/serializers/access_token_entity_base_spec.rb b/spec/serializers/access_token_entity_base_spec.rb
new file mode 100644
index 00000000000..e14a07a346a
--- /dev/null
+++ b/spec/serializers/access_token_entity_base_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe AccessTokenEntityBase do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:token) { create(:personal_access_token, user: user, expires_at: nil) }
+
+  subject(:json) {  described_class.new(token).as_json }
+
+  it 'has the correct attributes' do
+    expect(json).to(
+      include(
+        id: token.id,
+        name: token.name,
+        revoked: false,
+        created_at: token.created_at,
+        scopes: token.scopes,
+        expires_at: nil,
+        expired: false,
+        expires_soon: false
+      ))
+
+    expect(json).not_to include(:token)
+  end
+end