From 36a59d088eca61b834191dacea009677a96c052f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 May 2022 07:33:21 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-0-stable-ee --- spec/services/members/create_service_spec.rb | 32 +++++----- .../members/groups/creator_service_spec.rb | 24 ++++++-- spec/services/members/invite_service_spec.rb | 70 +++++++++++----------- .../members/projects/creator_service_spec.rb | 24 ++++++-- 4 files changed, 89 insertions(+), 61 deletions(-) (limited to 'spec/services/members') diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb index 25437be1e78..730175af0bb 100644 --- a/spec/services/members/create_service_spec.rb +++ b/spec/services/members/create_service_spec.rb @@ -7,11 +7,11 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ let_it_be(:user) { create(:user) } let_it_be(:member) { create(:user) } let_it_be(:user_invited_by_id) { create(:user) } - let_it_be(:user_ids) { member.id.to_s } + let_it_be(:user_id) { member.id.to_s } let_it_be(:access_level) { Gitlab::Access::GUEST } let(:additional_params) { { invite_source: '_invite_source_' } } - let(:params) { { user_ids: user_ids, access_level: access_level }.merge(additional_params) } + let(:params) { { user_id: user_id, access_level: access_level }.merge(additional_params) } let(:current_user) { user } subject(:execute_service) { described_class.new(current_user, params.merge({ source: source })).execute } @@ -51,7 +51,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end context 'when user_id is passed as an integer' do - let(:user_ids) { member.id } + let(:user_id) { member.id } it 'successfully creates member' do expect(execute_service[:status]).to eq(:success) @@ -60,8 +60,8 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'with user_ids as an array of integers' do - let(:user_ids) { [member.id, user_invited_by_id.id] } + context 'with user_id as an array of integers' do + let(:user_id) { [member.id, user_invited_by_id.id] } it 'successfully creates members' do expect(execute_service[:status]).to eq(:success) @@ -70,8 +70,8 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'with user_ids as an array of strings' do - let(:user_ids) { [member.id.to_s, user_invited_by_id.id.to_s] } + context 'with user_id as an array of strings' do + let(:user_id) { [member.id.to_s, user_invited_by_id.id.to_s] } it 'successfully creates members' do expect(execute_service[:status]).to eq(:success) @@ -101,7 +101,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end context 'when passing no user ids' do - let(:user_ids) { '' } + let(:user_id) { '' } it 'does not add a member' do expect(execute_service[:status]).to eq(:error) @@ -112,7 +112,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end context 'when passing many user ids' do - let(:user_ids) { 1.upto(101).to_a.join(',') } + let(:user_id) { 1.upto(101).to_a.join(',') } it 'limits the number of users to 100' do expect(execute_service[:status]).to eq(:error) @@ -134,7 +134,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end context 'when passing an existing invite user id' do - let(:user_ids) { create(:project_member, :invited, project: source).invite_email } + let(:user_id) { create(:project_member, :invited, project: source).invite_email } it 'does not add a member' do expect(execute_service[:status]).to eq(:error) @@ -146,7 +146,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ context 'when adding a project_bot' do let_it_be(:project_bot) { create(:user, :project_bot) } - let(:user_ids) { project_bot.id } + let(:user_id) { project_bot.id } context 'when project_bot is already a member' do before do @@ -213,7 +213,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end context 'when it is a net_new_user' do - let(:additional_params) { { invite_source: '_invite_source_', user_ids: 'email@example.org' } } + let(:additional_params) { { invite_source: '_invite_source_', user_id: 'email@example.org' } } it 'tracks the invite source from params' do execute_service @@ -248,8 +248,8 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ ) end - context 'when it is an invite by email passed to user_ids' do - let(:user_ids) { 'email@example.org' } + context 'when it is an invite by email passed to user_id' do + let(:user_id) { 'email@example.org' } it 'does not create task issues' do expect(TasksToBeDone::CreateWorker).not_to receive(:perform_async) @@ -263,7 +263,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end let(:another_user) { create(:user) } - let(:user_ids) { [member.id, another_user.id].join(',') } + let(:user_id) { [member.id, another_user.id].join(',') } it 'still creates 2 task issues', :aggregate_failures do expect(TasksToBeDone::CreateWorker) @@ -326,7 +326,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ end context 'when a member was already invited' do - let(:user_ids) { create(:project_member, :invited, project: source).invite_email } + let(:user_id) { create(:project_member, :invited, project: source).invite_email } let(:additional_params) do { invite_source: '_invite_source_', tasks_project_id: source.id, tasks_to_be_done: %w(ci code) } end diff --git a/spec/services/members/groups/creator_service_spec.rb b/spec/services/members/groups/creator_service_spec.rb index 4427c4e7d9f..c3ba7c0374d 100644 --- a/spec/services/members/groups/creator_service_spec.rb +++ b/spec/services/members/groups/creator_service_spec.rb @@ -3,14 +3,28 @@ require 'spec_helper' RSpec.describe Members::Groups::CreatorService do - it_behaves_like 'member creation' do - let_it_be(:source, reload: true) { create(:group, :public) } - let_it_be(:member_type) { GroupMember } - end - describe '.access_levels' do it 'returns Gitlab::Access.options_with_owner' do expect(described_class.access_levels).to eq(Gitlab::Access.sym_options_with_owner) end end + + describe '#execute' do + let_it_be(:source, reload: true) { create(:group, :public) } + let_it_be(:user) { create(:user) } + + it_behaves_like 'member creation' do + let_it_be(:member_type) { GroupMember } + end + + context 'authorized projects update' do + it 'schedules a single project authorization update job when called multiple times' do + expect(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait).once + + 1.upto(3) do + described_class.new(source, user, :maintainer).execute + end + end + end + end end diff --git a/spec/services/members/invite_service_spec.rb b/spec/services/members/invite_service_spec.rb index ab740138a8b..8213e8baae0 100644 --- a/spec/services/members/invite_service_spec.rb +++ b/spec/services/members/invite_service_spec.rb @@ -52,8 +52,8 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'with user_ids as integers' do - let(:params) { { user_ids: [project_user.id, user_invited_by_id.id] } } + context 'with user_id as integers' do + let(:params) { { user_id: [project_user.id, user_invited_by_id.id] } } it 'successfully creates members' do expect_to_create_members(count: 2) @@ -61,8 +61,8 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'with user_ids as strings' do - let(:params) { { user_ids: [project_user.id.to_s, user_invited_by_id.id.to_s] } } + context 'with user_id as strings' do + let(:params) { { user_id: [project_user.id.to_s, user_invited_by_id.id.to_s] } } it 'successfully creates members' do expect_to_create_members(count: 2) @@ -70,9 +70,9 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'with a mixture of emails and user_ids' do + context 'with a mixture of emails and user_id' do let(:params) do - { user_ids: [project_user.id, user_invited_by_id.id], email: %w[email@example.org email2@example.org] } + { user_id: [project_user.id, user_invited_by_id.id], email: %w[email@example.org email2@example.org] } end it 'successfully creates members' do @@ -92,8 +92,8 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'with user_ids' do - let(:params) { { user_ids: "#{project_user.id},#{user_invited_by_id.id}" } } + context 'with user_id' do + let(:params) { { user_id: "#{project_user.id},#{user_invited_by_id.id}" } } it 'successfully creates members' do expect_to_create_members(count: 2) @@ -101,9 +101,9 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'with a mixture of emails and user_ids' do + context 'with a mixture of emails and user_id' do let(:params) do - { user_ids: "#{project_user.id},#{user_invited_by_id.id}", email: 'email@example.org,email2@example.org' } + { user_id: "#{project_user.id},#{user_invited_by_id.id}", email: 'email@example.org,email2@example.org' } end it 'successfully creates members' do @@ -114,9 +114,9 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'when invites formats are mixed' do - context 'when user_ids is an array and emails is a string' do + context 'when user_id is an array and emails is a string' do let(:params) do - { user_ids: [project_user.id, user_invited_by_id.id], email: 'email@example.org,email2@example.org' } + { user_id: [project_user.id, user_invited_by_id.id], email: 'email@example.org,email2@example.org' } end it 'successfully creates members' do @@ -125,9 +125,9 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'when user_ids is a string and emails is an array' do + context 'when user_id is a string and emails is an array' do let(:params) do - { user_ids: "#{project_user.id},#{user_invited_by_id.id}", email: %w[email@example.org email2@example.org] } + { user_id: "#{project_user.id},#{user_invited_by_id.id}", email: %w[email@example.org email2@example.org] } end it 'successfully creates members' do @@ -147,8 +147,8 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'when user_ids are passed as an empty string' do - let(:params) { { user_ids: '' } } + context 'when user_id are passed as an empty string' do + let(:params) { { user_id: '' } } it 'returns an error' do expect_not_to_create_members @@ -156,8 +156,8 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'when user_ids and emails are both passed as empty strings' do - let(:params) { { user_ids: '', email: '' } } + context 'when user_id and emails are both passed as empty strings' do + let(:params) { { user_id: '', email: '' } } it 'returns an error' do expect_not_to_create_members @@ -166,7 +166,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'when user_id is passed as an integer' do - let(:params) { { user_ids: project_user.id } } + let(:params) { { user_id: project_user.id } } it 'successfully creates member' do expect_to_create_members(count: 1) @@ -196,7 +196,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'with user_id and singular invalid email' do - let(:params) { { user_ids: project_user.id, email: '_bogus_' } } + let(:params) { { user_id: project_user.id, email: '_bogus_' } } it 'has partial success' do expect_to_create_members(count: 1) @@ -219,7 +219,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'with duplicate user ids' do - let(:params) { { user_ids: "#{project_user.id},#{project_user.id}" } } + let(:params) { { user_id: "#{project_user.id},#{project_user.id}" } } it 'only creates one member per unique invite' do expect_to_create_members(count: 1) @@ -228,7 +228,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'with duplicate member by adding as user id and email' do - let(:params) { { user_ids: project_user.id, email: project_user.email } } + let(:params) { { user_id: project_user.id, email: project_user.email } } it 'only creates one member per unique invite' do expect_to_create_members(count: 1) @@ -269,9 +269,9 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end end - context 'with user_ids' do - let(:user_ids) { 1.upto(101).to_a.join(',') } - let(:params) { { user_ids: user_ids } } + context 'with user_id' do + let(:user_id) { 1.upto(101).to_a.join(',') } + let(:params) { { user_id: user_id } } it 'limits the number of users to 100' do expect_not_to_create_members @@ -292,7 +292,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'with user_id' do - let(:params) { { user_ids: project_user.id } } + let(:params) { { user_id: project_user.id } } it_behaves_like 'records an onboarding progress action', :user_added @@ -304,7 +304,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ context 'when assigning tasks to be done' do let(:params) do - { user_ids: project_user.id, tasks_to_be_done: %w(ci code), tasks_project_id: project.id } + { user_id: project_user.id, tasks_to_be_done: %w(ci code), tasks_project_id: project.id } end it 'creates 2 task issues', :aggregate_failures do @@ -332,7 +332,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'with user_id' do - let(:params) { { user_ids: user_invited_by_id.id, access_level: -1 } } + let(:params) { { user_id: user_invited_by_id.id, access_level: -1 } } it 'returns an error' do expect_not_to_create_members @@ -341,7 +341,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'with a mix of user_id and email' do - let(:params) { { user_ids: user_invited_by_id.id, email: project_user.email, access_level: -1 } } + let(:params) { { user_id: user_invited_by_id.id, email: project_user.email, access_level: -1 } } it 'returns errors' do expect_not_to_create_members @@ -387,7 +387,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ context 'with user_id that already exists' do let!(:existing_member) { create(:project_member, project: project, user: project_user) } - let(:params) { { user_ids: existing_member.user_id } } + let(:params) { { user_id: existing_member.user_id } } it 'does not add the member again and is successful' do expect_to_create_members(count: 0) @@ -397,7 +397,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ context 'with user_id that already exists with a lower access_level' do let!(:existing_member) { create(:project_member, :developer, project: project, user: project_user) } - let(:params) { { user_ids: existing_member.user_id, access_level: ProjectMember::MAINTAINER } } + let(:params) { { user_id: existing_member.user_id, access_level: ProjectMember::MAINTAINER } } it 'does not add the member again and updates the access_level' do expect_to_create_members(count: 0) @@ -408,7 +408,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ context 'with user_id that already exists with a higher access_level' do let!(:existing_member) { create(:project_member, :developer, project: project, user: project_user) } - let(:params) { { user_ids: existing_member.user_id, access_level: ProjectMember::GUEST } } + let(:params) { { user_id: existing_member.user_id, access_level: ProjectMember::GUEST } } it 'does not add the member again and updates the access_level' do expect_to_create_members(count: 0) @@ -428,7 +428,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'when access_level is lower than inheriting member' do - let(:params) { { user_ids: group_member.user_id, access_level: ProjectMember::GUEST }} + let(:params) { { user_id: group_member.user_id, access_level: ProjectMember::GUEST }} it 'does not add the member and returns an error' do msg = "Access level should be greater than or equal " \ @@ -440,7 +440,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'when access_level is the same as the inheriting member' do - let(:params) { { user_ids: group_member.user_id, access_level: ProjectMember::DEVELOPER }} + let(:params) { { user_id: group_member.user_id, access_level: ProjectMember::DEVELOPER }} it 'adds the member with correct access_level' do expect_to_create_members(count: 1) @@ -450,7 +450,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ end context 'when access_level is greater than the inheriting member' do - let(:params) { { user_ids: group_member.user_id, access_level: ProjectMember::MAINTAINER }} + let(:params) { { user_id: group_member.user_id, access_level: ProjectMember::MAINTAINER }} it 'adds the member with correct access_level' do expect_to_create_members(count: 1) diff --git a/spec/services/members/projects/creator_service_spec.rb b/spec/services/members/projects/creator_service_spec.rb index 7ba183759bc..7605238c3c5 100644 --- a/spec/services/members/projects/creator_service_spec.rb +++ b/spec/services/members/projects/creator_service_spec.rb @@ -3,14 +3,28 @@ require 'spec_helper' RSpec.describe Members::Projects::CreatorService do - it_behaves_like 'member creation' do - let_it_be(:source, reload: true) { create(:project, :public) } - let_it_be(:member_type) { ProjectMember } - end - describe '.access_levels' do it 'returns Gitlab::Access.sym_options_with_owner' do expect(described_class.access_levels).to eq(Gitlab::Access.sym_options_with_owner) end end + + describe '#execute' do + let_it_be(:source, reload: true) { create(:project, :public) } + let_it_be(:user) { create(:user) } + + it_behaves_like 'member creation' do + let_it_be(:member_type) { ProjectMember } + end + + context 'authorized projects update' do + it 'schedules a single project authorization update job when called multiple times' do + expect(AuthorizedProjectUpdate::UserRefreshFromReplicaWorker).to receive(:bulk_perform_in).once + + 1.upto(3) do + described_class.new(source, user, :maintainer).execute + end + end + end + end end -- cgit v1.2.1