Merge branch 'sh-fix-invited-members' into 'master'

Fix Error 500 when inviting user already present

Closes #61574

See merge request gitlab-org/gitlab-ce!28198

(cherry picked from commit a0da5e08ec566fb4c571391cb8281bced25ce35d)

f1640616 Fix Error 500 when inviting user already present

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb
index 2c4fb131ed9..674fe0f666e 100644
--- a/spec/services/members/create_service_spec.rb
+++ b/spec/services/members/create_service_spec.rb
@@ -44,7 +44,18 @@ describe Members::CreateService do
     result = described_class.new(user, params).execute(project)
 
     expect(result[:status]).to eq(:error)
-    expect(result[:message]).to include(project_user.username)
+    expect(result[:message]).to include("#{project_user.username}: Access level is not included in the list")
     expect(project.users).not_to include project_user
   end
+
+  it 'does not add a member with an existing invite' do
+    invited_member = create(:project_member, :invited, project: project)
+
+    params = { user_ids: invited_member.invite_email,
+               access_level: Gitlab::Access::GUEST }
+    result = described_class.new(user, params).execute(project)
+
+    expect(result[:status]).to eq(:error)
+    expect(result[:message]).to eq('Invite email has already been taken')
+  end
 end