Add latest changes from gitlab-org/gitlab@master

6 files changed, 222 insertions, 0 deletions

diff --git a/spec/serializers/group_access_token_entity_spec.rb b/spec/serializers/group_access_token_entity_spec.rb
new file mode 100644
index 00000000000..39b587c7df7
--- /dev/null
+++ b/spec/serializers/group_access_token_entity_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe GroupAccessTokenEntity do
+  let_it_be(:group) { create(:group) }
+  let_it_be(:bot) { create(:user, :project_bot) }
+  let_it_be(:token) { create(:personal_access_token, user: bot) }
+
+  subject(:json) {  described_class.new(token, group: group).as_json }
+
+  context 'when bot is a member of the group' do
+    before do
+      group.add_developer(bot)
+    end
+
+    it 'has the correct attributes' do
+      expected_revoke_path = Gitlab::Routing.url_helpers
+                                            .revoke_group_settings_access_token_path(
+                                              { id: token,
+                                                group_id: group.path })
+
+      expect(json).to(
+        include(
+          id: token.id,
+          name: token.name,
+          scopes: token.scopes,
+          user_id: token.user_id,
+          revoke_path: expected_revoke_path,
+          access_level: ::Gitlab::Access::DEVELOPER
+        ))
+
+      expect(json).not_to include(:token)
+    end
+  end
+
+  context 'when bot is unrelated to the group' do
+    it 'has the correct attributes' do
+      expected_revoke_path = Gitlab::Routing.url_helpers
+                                            .revoke_group_settings_access_token_path(
+                                              { id: token,
+                                                group_id: group.path })
+
+      expect(json).to(
+        include(
+          id: token.id,
+          name: token.name,
+          scopes: token.scopes,
+          user_id: token.user_id,
+          revoke_path: expected_revoke_path,
+          access_level: nil
+        ))
+
+      expect(json).not_to include(:token)
+    end
+  end
+end
diff --git a/spec/serializers/group_access_token_serializer_spec.rb b/spec/serializers/group_access_token_serializer_spec.rb
new file mode 100644
index 00000000000..3b12c3115c9
--- /dev/null
+++ b/spec/serializers/group_access_token_serializer_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe GroupAccessTokenSerializer do
+  let_it_be(:group) { create(:group) }
+  let_it_be(:bot) { create(:user, :project_bot) }
+
+  subject(:serializer) { described_class.new }
+
+  before do
+    group.add_developer(bot)
+  end
+
+  describe '#represent' do
+    it 'can render a single token' do
+      token = create(:personal_access_token, user: bot)
+
+      expect(serializer.represent(token, group: group)).to be_kind_of(Hash)
+    end
+
+    it 'can render a collection of tokens' do
+      tokens = create_list(:personal_access_token, 2, user: bot)
+
+      expect(serializer.represent(tokens, group: group)).to be_kind_of(Array)
+    end
+  end
+end
diff --git a/spec/serializers/personal_access_token_entity_spec.rb b/spec/serializers/personal_access_token_entity_spec.rb
new file mode 100644
index 00000000000..8a77a4e0036
--- /dev/null
+++ b/spec/serializers/personal_access_token_entity_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe PersonalAccessTokenEntity do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:token) { create(:personal_access_token, user: user) }
+
+  subject(:json) {  described_class.new(token).as_json }
+
+  it 'has the correct attributes' do
+    expected_revoke_path = Gitlab::Routing.url_helpers
+                                          .revoke_profile_personal_access_token_path(
+                                            { id: token })
+
+    expect(json).to(
+      include(
+        id: token.id,
+        name: token.name,
+        scopes: token.scopes,
+        user_id: token.user_id,
+        revoke_path: expected_revoke_path
+      ))
+
+    expect(json).not_to include(:token)
+  end
+end
diff --git a/spec/serializers/personal_access_token_serializer_spec.rb b/spec/serializers/personal_access_token_serializer_spec.rb
new file mode 100644
index 00000000000..e4adc6abccb
--- /dev/null
+++ b/spec/serializers/personal_access_token_serializer_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe PersonalAccessTokenSerializer do
+  subject(:serializer) { described_class.new }
+
+  describe '#represent' do
+    it 'can render a single token' do
+      token = create(:personal_access_token)
+
+      expect(serializer.represent(token)).to be_kind_of(Hash)
+    end
+
+    it 'can render a collection of tokens' do
+      tokens = create_list(:personal_access_token, 2)
+
+      expect(serializer.represent(tokens)).to be_kind_of(Array)
+    end
+  end
+end
diff --git a/spec/serializers/project_access_token_entity_spec.rb b/spec/serializers/project_access_token_entity_spec.rb
new file mode 100644
index 00000000000..616aa45e9d5
--- /dev/null
+++ b/spec/serializers/project_access_token_entity_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ProjectAccessTokenEntity do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:bot) { create(:user, :project_bot) }
+  let_it_be(:token) { create(:personal_access_token, user: bot) }
+
+  subject(:json) {  described_class.new(token, project: project).as_json }
+
+  context 'when bot is a member of the project' do
+    before do
+      project.add_developer(bot)
+    end
+
+    it 'has the correct attributes' do
+      expected_revoke_path = Gitlab::Routing.url_helpers
+                                            .revoke_namespace_project_settings_access_token_path(
+                                              { id: token,
+                                                namespace_id: project.namespace.path,
+                                                project_id: project.path })
+
+      expect(json).to(
+        include(
+          id: token.id,
+          name: token.name,
+          scopes: token.scopes,
+          user_id: token.user_id,
+          revoke_path: expected_revoke_path,
+          access_level: ::Gitlab::Access::DEVELOPER
+        ))
+
+      expect(json).not_to include(:token)
+    end
+  end
+
+  context 'when bot is unrelated to the project' do
+    let_it_be(:project) { create(:project) }
+
+    it 'has the correct attributes' do
+      expected_revoke_path = Gitlab::Routing.url_helpers
+                                            .revoke_namespace_project_settings_access_token_path(
+                                              { id: token,
+                                                namespace_id: project.namespace.path,
+                                                project_id: project.path })
+
+      expect(json).to(
+        include(
+          id: token.id,
+          name: token.name,
+          scopes: token.scopes,
+          user_id: token.user_id,
+          revoke_path: expected_revoke_path,
+          access_level: nil
+        ))
+
+      expect(json).not_to include(:token)
+    end
+  end
+end
diff --git a/spec/serializers/project_access_token_serializer_spec.rb b/spec/serializers/project_access_token_serializer_spec.rb
new file mode 100644
index 00000000000..1c0898d7841
--- /dev/null
+++ b/spec/serializers/project_access_token_serializer_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ProjectAccessTokenSerializer do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:bot) { create(:user, :project_bot) }
+
+  subject(:serializer) { described_class.new }
+
+  before do
+    project.add_developer(bot)
+  end
+
+  describe '#represent' do
+    it 'can render a single token' do
+      token = create(:personal_access_token, user: bot)
+
+      expect(serializer.represent(token, project: project)).to be_kind_of(Hash)
+    end
+
+    it 'can render a collection of tokens' do
+      tokens = create_list(:personal_access_token, 2, user: bot)
+
+      expect(serializer.represent(tokens, project: project)).to be_kind_of(Array)
+    end
+  end
+end