Add latest changes from gitlab-org/gitlab@master

6 files changed, 34 insertions, 45 deletions

diff --git a/spec/services/members/creator_service_spec.rb b/spec/services/members/creator_service_spec.rb
index ff5bf705b6c..8b1df2ab86d 100644
--- a/spec/services/members/creator_service_spec.rb
+++ b/spec/services/members/creator_service_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Members::CreatorService do
   describe '#execute' do
     it 'raises error for new member on authorization check implementation' do
       expect do
-        described_class.new(source, user, :maintainer, current_user: current_user).execute
+        described_class.add_user(source, user, :maintainer, current_user: current_user)
       end.to raise_error(NotImplementedError)
     end
 
@@ -19,7 +19,7 @@ RSpec.describe Members::CreatorService do
       source.add_developer(user)
 
       expect do
-        described_class.new(source, user, :maintainer, current_user: current_user).execute
+        described_class.add_user(source, user, :maintainer, current_user: current_user)
       end.to raise_error(NotImplementedError)
     end
   end
diff --git a/spec/services/members/groups/bulk_creator_service_spec.rb b/spec/services/members/groups/bulk_creator_service_spec.rb
deleted file mode 100644
index 3922c37487c..00000000000
--- a/spec/services/members/groups/bulk_creator_service_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Members::Groups::BulkCreatorService do
-  let_it_be(:source, reload: true) { create(:group, :public) }
-  let_it_be(:current_user) { create(:user) }
-
-  it_behaves_like 'bulk member creation' do
-    let_it_be(:member_type) { GroupMember }
-  end
-
-  it_behaves_like 'owner management'
-end
diff --git a/spec/services/members/groups/creator_service_spec.rb b/spec/services/members/groups/creator_service_spec.rb
index c3ba7c0374d..b80b7998eac 100644
--- a/spec/services/members/groups/creator_service_spec.rb
+++ b/spec/services/members/groups/creator_service_spec.rb
@@ -3,16 +3,24 @@
 require 'spec_helper'
 
 RSpec.describe Members::Groups::CreatorService do
+  let_it_be(:source, reload: true) { create(:group, :public) }
+  let_it_be(:user) { create(:user) }
+
   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 'owner management'
+
+  describe '.add_users' do
+    it_behaves_like 'bulk member creation' do
+      let_it_be(:member_type) { GroupMember }
+    end
+  end
 
+  describe '.add_user' do
     it_behaves_like 'member creation' do
       let_it_be(:member_type) { GroupMember }
     end
@@ -22,7 +30,7 @@ RSpec.describe Members::Groups::CreatorService do
         expect(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait).once
 
         1.upto(3) do
-          described_class.new(source, user, :maintainer).execute
+          described_class.add_user(source, user, :maintainer)
         end
       end
     end
diff --git a/spec/services/members/invite_service_spec.rb b/spec/services/members/invite_service_spec.rb
index 8213e8baae0..a948041479b 100644
--- a/spec/services/members/invite_service_spec.rb
+++ b/spec/services/members/invite_service_spec.rb
@@ -367,20 +367,21 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_
 
     context 'when email is already a member with a user on the project' do
       let!(:existing_member) { create(:project_member, :guest, project: project) }
-      let(:params) { { email: "#{existing_member.user.email}" } }
+      let(:params) { { email: "#{existing_member.user.email}", access_level: ProjectMember::MAINTAINER } }
 
-      it 'returns an error for the already invited email' do
-        expect_not_to_create_members
-        expect(result[:message][existing_member.user.email]).to eq("User already exists in source")
+      it 'allows re-invite of an already invited email and updates the access_level' do
+        expect { result }.not_to change(ProjectMember, :count)
+        expect(result[:status]).to eq(:success)
+        expect(existing_member.reset.access_level).to eq ProjectMember::MAINTAINER
       end
 
       context 'when email belongs to an existing user as a secondary email' do
         let(:secondary_email) { create(:email, email: 'secondary@example.com', user: existing_member.user) }
         let(:params) { { email: "#{secondary_email.email}" } }
 
-        it 'returns an error for the already invited email' do
-          expect_not_to_create_members
-          expect(result[:message][secondary_email.email]).to eq("User already exists in source")
+        it 'allows re-invite to an already invited email' do
+          expect_to_create_members(count: 0)
+          expect(result[:status]).to eq(:success)
         end
       end
     end
diff --git a/spec/services/members/projects/bulk_creator_service_spec.rb b/spec/services/members/projects/bulk_creator_service_spec.rb
deleted file mode 100644
index dd998b47eb3..00000000000
--- a/spec/services/members/projects/bulk_creator_service_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Members::Projects::BulkCreatorService do
-  let_it_be(:source, reload: true) { create(:project, :public) }
-  let_it_be(:current_user) { create(:user) }
-
-  it_behaves_like 'bulk member creation' do
-    let_it_be(:member_type) { ProjectMember }
-  end
-
-  it_behaves_like 'owner management'
-end
diff --git a/spec/services/members/projects/creator_service_spec.rb b/spec/services/members/projects/creator_service_spec.rb
index 7605238c3c5..38955122ab0 100644
--- a/spec/services/members/projects/creator_service_spec.rb
+++ b/spec/services/members/projects/creator_service_spec.rb
@@ -3,16 +3,24 @@
 require 'spec_helper'
 
 RSpec.describe Members::Projects::CreatorService do
+  let_it_be(:source, reload: true) { create(:project, :public) }
+  let_it_be(:user) { create(:user) }
+
   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 'owner management'
+
+  describe '.add_users' do
+    it_behaves_like 'bulk member creation' do
+      let_it_be(:member_type) { ProjectMember }
+    end
+  end
 
+  describe '.add_user' do
     it_behaves_like 'member creation' do
       let_it_be(:member_type) { ProjectMember }
     end
@@ -22,7 +30,7 @@ RSpec.describe Members::Projects::CreatorService do
         expect(AuthorizedProjectUpdate::UserRefreshFromReplicaWorker).to receive(:bulk_perform_in).once
 
         1.upto(3) do
-          described_class.new(source, user, :maintainer).execute
+          described_class.add_user(source, user, :maintainer)
         end
       end
     end