From 2d181003830956f5e690cce74be50bb4d96048f8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 6 Jun 2022 18:09:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/serializers/deploy_key_entity_spec.rb | 122 --------------------- .../deploy_keys/basic_deploy_key_entity_spec.rb | 110 +++++++++++++++++++ .../deploy_keys/deploy_key_entity_spec.rb | 51 +++++++++ 3 files changed, 161 insertions(+), 122 deletions(-) delete mode 100644 spec/serializers/deploy_key_entity_spec.rb create mode 100644 spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb create mode 100644 spec/serializers/deploy_keys/deploy_key_entity_spec.rb (limited to 'spec/serializers') diff --git a/spec/serializers/deploy_key_entity_spec.rb b/spec/serializers/deploy_key_entity_spec.rb deleted file mode 100644 index e8d9701be67..00000000000 --- a/spec/serializers/deploy_key_entity_spec.rb +++ /dev/null @@ -1,122 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe DeployKeyEntity do - include RequestAwareEntity - - let(:user) { create(:user) } - let(:project) { create(:project, :internal)} - let(:project_private) { create(:project, :private)} - let(:deploy_key) { create(:deploy_key) } - let(:options) { { user: user } } - - let(:entity) { described_class.new(deploy_key, options) } - - before do - project.deploy_keys << deploy_key - project_private.deploy_keys << deploy_key - end - - describe 'returns deploy keys with projects a user can read' do - let(:expected_result) do - { - id: deploy_key.id, - user_id: deploy_key.user_id, - title: deploy_key.title, - fingerprint: deploy_key.fingerprint, - fingerprint_sha256: deploy_key.fingerprint_sha256, - destroyed_when_orphaned: true, - almost_orphaned: false, - created_at: deploy_key.created_at, - updated_at: deploy_key.updated_at, - can_edit: false, - deploy_keys_projects: [ - { - can_push: false, - project: - { - id: project.id, - name: project.name, - full_path: project_path(project), - full_name: project.full_name - } - } - ] - } - end - - it { expect(entity.as_json).to eq(expected_result) } - end - - context 'user is an admin' do - let(:user) { create(:user, :admin) } - - context 'when admin mode is enabled', :enable_admin_mode do - it { expect(entity.as_json).to include(can_edit: true) } - end - - context 'when admin mode is disabled' do - it { expect(entity.as_json).not_to include(can_edit: true) } - end - end - - context 'user is a project maintainer' do - before do - project.add_maintainer(user) - end - - context 'project deploy key' do - it { expect(entity.as_json).to include(can_edit: true) } - end - - context 'public deploy key' do - let(:deploy_key_public) { create(:deploy_key, public: true) } - let(:entity_public) { described_class.new(deploy_key_public, { user: user, project: project }) } - - before do - project.deploy_keys << deploy_key_public - end - - it { expect(entity_public.as_json).to include(can_edit: true) } - end - end - - describe 'with_owner option' do - it 'does not return an owner payload when it is set to false' do - options[:with_owner] = false - - payload = entity.as_json - - expect(payload[:owner]).not_to be_present - end - - describe 'when with_owner is set to true' do - before do - options[:with_owner] = true - end - - it 'returns an owner payload' do - payload = entity.as_json - - expect(payload[:owner]).to be_present - expect(payload[:owner].keys).to include(:id, :name, :username, :avatar_url) - end - - it 'does not return an owner if current_user cannot read the owner' do - allow(Ability).to receive(:allowed?).and_call_original - allow(Ability).to receive(:allowed?).with(options[:user], :read_user, deploy_key.user).and_return(false) - - payload = entity.as_json - - expect(payload[:owner]).to be_nil - end - end - end - - it 'does not return an owner payload with_owner option not passed in' do - payload = entity.as_json - - expect(payload[:owner]).not_to be_present - end -end diff --git a/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb b/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb new file mode 100644 index 00000000000..c39eb14e339 --- /dev/null +++ b/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb @@ -0,0 +1,110 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe DeployKeys::BasicDeployKeyEntity do + include RequestAwareEntity + + let(:user) { create(:user) } + let(:project) { create(:project, :internal)} + let(:project_private) { create(:project, :private)} + let(:deploy_key) { create(:deploy_key) } + let(:options) { { user: user } } + + let(:entity) { described_class.new(deploy_key, options) } + + before do + project.deploy_keys << deploy_key + project_private.deploy_keys << deploy_key + end + + describe 'returns deploy keys' do + let(:expected_result) do + { + id: deploy_key.id, + user_id: deploy_key.user_id, + title: deploy_key.title, + fingerprint: deploy_key.fingerprint, + fingerprint_sha256: deploy_key.fingerprint_sha256, + destroyed_when_orphaned: true, + almost_orphaned: false, + created_at: deploy_key.created_at, + updated_at: deploy_key.updated_at, + can_edit: false + } + end + + it { expect(entity.as_json).to eq(expected_result) } + end + + context 'user is an admin' do + let(:user) { create(:user, :admin) } + + context 'when admin mode is enabled', :enable_admin_mode do + it { expect(entity.as_json).to include(can_edit: true) } + end + + context 'when admin mode is disabled' do + it { expect(entity.as_json).not_to include(can_edit: true) } + end + end + + context 'user is a project maintainer' do + before do + project.add_maintainer(user) + end + + context 'project deploy key' do + it { expect(entity.as_json).to include(can_edit: true) } + end + + context 'public deploy key' do + let(:deploy_key_public) { create(:deploy_key, public: true) } + let(:entity_public) { described_class.new(deploy_key_public, { user: user, project: project }) } + + before do + project.deploy_keys << deploy_key_public + end + + it { expect(entity_public.as_json).to include(can_edit: true) } + end + end + + describe 'with_owner option' do + it 'does not return an owner payload when it is set to false' do + options[:with_owner] = false + + payload = entity.as_json + + expect(payload[:owner]).not_to be_present + end + + describe 'when with_owner is set to true' do + before do + options[:with_owner] = true + end + + it 'returns an owner payload' do + payload = entity.as_json + + expect(payload[:owner]).to be_present + expect(payload[:owner].keys).to include(:id, :name, :username, :avatar_url) + end + + it 'does not return an owner if current_user cannot read the owner' do + allow(Ability).to receive(:allowed?).and_call_original + allow(Ability).to receive(:allowed?).with(options[:user], :read_user, deploy_key.user).and_return(false) + + payload = entity.as_json + + expect(payload[:owner]).to be_nil + end + end + end + + it 'does not return an owner payload with_owner option not passed in' do + payload = entity.as_json + + expect(payload[:owner]).not_to be_present + end +end diff --git a/spec/serializers/deploy_keys/deploy_key_entity_spec.rb b/spec/serializers/deploy_keys/deploy_key_entity_spec.rb new file mode 100644 index 00000000000..e989aa8656c --- /dev/null +++ b/spec/serializers/deploy_keys/deploy_key_entity_spec.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe DeployKeys::DeployKeyEntity do + include RequestAwareEntity + + let(:user) { create(:user) } + let(:project) { create(:project, :internal)} + let(:project_private) { create(:project, :private)} + let(:deploy_key) { create(:deploy_key) } + let(:options) { { user: user } } + + let(:entity) { described_class.new(deploy_key, options) } + + before do + project.deploy_keys << deploy_key + project_private.deploy_keys << deploy_key + end + + describe 'returns deploy keys with projects a user can read' do + let(:expected_result) do + { + id: deploy_key.id, + user_id: deploy_key.user_id, + title: deploy_key.title, + fingerprint: deploy_key.fingerprint, + fingerprint_sha256: deploy_key.fingerprint_sha256, + destroyed_when_orphaned: true, + almost_orphaned: false, + created_at: deploy_key.created_at, + updated_at: deploy_key.updated_at, + can_edit: false, + deploy_keys_projects: [ + { + can_push: false, + project: + { + id: project.id, + name: project.name, + full_path: project_path(project), + full_name: project.full_name + } + } + ] + } + end + + it { expect(entity.as_json).to eq(expected_result) } + end +end -- cgit v1.2.3