Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 38 insertions, 0 deletions

diff --git a/spec/services/labels/available_labels_service_spec.rb b/spec/services/labels/available_labels_service_spec.rb
index 9ee0b80edcd..355dbd0c712 100644
--- a/spec/services/labels/available_labels_service_spec.rb
+++ b/spec/services/labels/available_labels_service_spec.rb
@@ -36,6 +36,15 @@ RSpec.describe Labels::AvailableLabelsService do
           expect(result).to include(project_label, group_label)
           expect(result).not_to include(other_project_label, other_group_label)
         end
+
+        it 'do not cause additional query for finding labels' do
+          label_titles = [project_label.title]
+          control_count = ActiveRecord::QueryRecorder.new { described_class.new(user, project, labels: label_titles).find_or_create_by_titles }
+
+          new_label = create(:label, project: project)
+          label_titles = [project_label.title, new_label.title]
+          expect { described_class.new(user, project, labels: label_titles).find_or_create_by_titles }.not_to exceed_query_limit(control_count)
+        end
       end
     end
 
diff --git a/spec/services/labels/find_or_create_service_spec.rb b/spec/services/labels/find_or_create_service_spec.rb
index aa9eb0e6a0d..3ea2727dc60 100644
--- a/spec/services/labels/find_or_create_service_spec.rb
+++ b/spec/services/labels/find_or_create_service_spec.rb
@@ -25,6 +25,35 @@ RSpec.describe Labels::FindOrCreateService do
           project.add_developer(user)
         end
 
+        context 'when existing_labels_by_title is provided' do
+          let(:preloaded_label) { build(:label, title: 'Security') }
+
+          before do
+            params.merge!(
+              existing_labels_by_title: {
+                'Security' => preloaded_label
+              })
+          end
+
+          context 'when label exists' do
+            it 'returns preloaded label' do
+              expect(service.execute).to eq preloaded_label
+            end
+          end
+
+          context 'when label does not exists' do
+            before do
+              params[:title] = 'Audit'
+            end
+
+            it 'does not generates additional label search' do
+              service.execute
+
+              expect(LabelsFinder).not_to receive(:new)
+            end
+          end
+        end
+
         context 'when label does not exist at group level' do
           it 'creates a new label at project level' do
             expect { service.execute }.to change(project.labels, :count).by(1)