Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 18 insertions, 3 deletions

diff --git a/spec/models/project_authorization_spec.rb b/spec/models/project_authorization_spec.rb
index c517fc8be55..58c0ff48b46 100644
--- a/spec/models/project_authorization_spec.rb
+++ b/spec/models/project_authorization_spec.rb
@@ -3,9 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe ProjectAuthorization do
-  let(:user) { create(:user) }
-  let(:project1) { create(:project) }
-  let(:project2) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project1) { create(:project) }
+  let_it_be(:project2) { create(:project) }
+  let_it_be(:project3) { create(:project) }
 
   describe '.insert_authorizations' do
     it 'inserts the authorizations' do
@@ -23,5 +24,19 @@ RSpec.describe ProjectAuthorization do
 
       expect(user.project_authorizations.count).to eq(2)
     end
+
+    it 'skips duplicates and inserts the remaining rows without error' do
+      create(:project_authorization, user: user, project: project1, access_level: Gitlab::Access::MAINTAINER)
+
+      rows = [
+        [user.id, project1.id, Gitlab::Access::MAINTAINER],
+        [user.id, project2.id, Gitlab::Access::MAINTAINER],
+        [user.id, project3.id, Gitlab::Access::MAINTAINER]
+      ]
+
+      described_class.insert_authorizations(rows)
+
+      expect(user.project_authorizations.pluck(:user_id, :project_id, :access_level)).to match_array(rows)
+    end
   end
 end