Add latest changes from gitlab-org/gitlab@master

4 files changed, 155 insertions, 21 deletions

diff --git a/spec/services/ci/process_sync_events_service_spec.rb b/spec/services/ci/process_sync_events_service_spec.rb
new file mode 100644
index 00000000000..00b670ff54f
--- /dev/null
+++ b/spec/services/ci/process_sync_events_service_spec.rb
@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ci::ProcessSyncEventsService do
+  let!(:group) { create(:group) }
+  let!(:project1) { create(:project, group: group) }
+  let!(:project2) { create(:project, group: group) }
+  let!(:parent_group_1) { create(:group) }
+  let!(:parent_group_2) { create(:group) }
+
+  subject(:service) { described_class.new(sync_event_class, hierarchy_class) }
+
+  describe '#perform' do
+    subject(:execute) { service.execute }
+
+    context 'for Projects::SyncEvent' do
+      let(:sync_event_class) { Projects::SyncEvent }
+      let(:hierarchy_class) { ::Ci::ProjectMirror }
+
+      before do
+        Projects::SyncEvent.delete_all
+
+        project1.update!(group: parent_group_1)
+        project2.update!(group: parent_group_2)
+      end
+
+      it 'consumes events' do
+        expect { execute }.to change(Projects::SyncEvent, :count).from(2).to(0)
+
+        expect(project1.ci_project_mirror).to have_attributes(
+          namespace_id: parent_group_1.id
+        )
+        expect(project2.ci_project_mirror).to have_attributes(
+          namespace_id: parent_group_2.id
+        )
+      end
+
+      it 'enqueues Projects::ProcessSyncEventsWorker if any left' do
+        stub_const("#{described_class}::BATCH_SIZE", 1)
+
+        expect(Projects::ProcessSyncEventsWorker).to receive(:perform_async)
+
+        execute
+      end
+
+      it 'does not enqueue Projects::ProcessSyncEventsWorker if no left' do
+        stub_const("#{described_class}::BATCH_SIZE", 2)
+
+        expect(Projects::ProcessSyncEventsWorker).not_to receive(:perform_async)
+
+        execute
+      end
+
+      context 'when there is no event' do
+        before do
+          Projects::SyncEvent.delete_all
+        end
+
+        it 'does nothing' do
+          expect { execute }.not_to change(Projects::SyncEvent, :count)
+        end
+      end
+
+      context 'when the FF ci_namespace_project_mirrors is disabled' do
+        before do
+          stub_feature_flags(ci_namespace_project_mirrors: false)
+        end
+
+        it 'does nothing' do
+          expect { execute }.not_to change(Projects::SyncEvent, :count)
+        end
+      end
+    end
+
+    context 'for Namespaces::SyncEvent' do
+      let(:sync_event_class) { Namespaces::SyncEvent }
+      let(:hierarchy_class) { ::Ci::NamespaceMirror }
+
+      before do
+        Namespaces::SyncEvent.delete_all
+
+        group.update!(parent: parent_group_2)
+        parent_group_2.update!(parent: parent_group_1)
+      end
+
+      shared_examples 'event consuming' do
+        it 'consumes events' do
+          expect { execute }.to change(Namespaces::SyncEvent, :count).from(2).to(0)
+
+          expect(group.ci_namespace_mirror).to have_attributes(
+            traversal_ids: [parent_group_1.id, parent_group_2.id, group.id]
+          )
+          expect(parent_group_2.ci_namespace_mirror).to have_attributes(
+            traversal_ids: [parent_group_1.id, parent_group_2.id]
+          )
+        end
+      end
+
+      context 'when the FFs sync_traversal_ids, use_traversal_ids and use_traversal_ids_for_ancestors are disabled' do
+        before do
+          stub_feature_flags(sync_traversal_ids: false,
+                             use_traversal_ids: false,
+                             use_traversal_ids_for_ancestors: false)
+        end
+
+        it_behaves_like 'event consuming'
+      end
+
+      it_behaves_like 'event consuming'
+
+      it 'enqueues Namespaces::ProcessSyncEventsWorker if any left' do
+        stub_const("#{described_class}::BATCH_SIZE", 1)
+
+        expect(Namespaces::ProcessSyncEventsWorker).to receive(:perform_async)
+
+        execute
+      end
+
+      it 'does not enqueue Namespaces::ProcessSyncEventsWorker if no left' do
+        stub_const("#{described_class}::BATCH_SIZE", 2)
+
+        expect(Namespaces::ProcessSyncEventsWorker).not_to receive(:perform_async)
+
+        execute
+      end
+    end
+  end
+end
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index 817fed06b50..e3e2f5b59da 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -128,25 +128,9 @@ RSpec.describe Ci::RetryBuildService do
         expect(new_build.needs).not_to match(build.needs)
       end
 
-      context 'when clone_job_variables_at_job_retry is enabled' do
-        before do
-          stub_feature_flags(clone_job_variables_at_job_retry: true)
-        end
-
-        it 'clones only internal job variables' do
-          expect(new_build.job_variables.count).to eq(1)
-          expect(new_build.job_variables).to contain_exactly(having_attributes(key: internal_job_variable.key, value: internal_job_variable.value))
-        end
-      end
-
-      context 'when clone_job_variables_at_job_retry is not enabled' do
-        before do
-          stub_feature_flags(clone_job_variables_at_job_retry: false)
-        end
-
-        it 'does not clone internal job variables' do
-          expect(new_build.job_variables.count).to eq(0)
-        end
+      it 'clones only internal job variables' do
+        expect(new_build.job_variables.count).to eq(1)
+        expect(new_build.job_variables).to contain_exactly(having_attributes(key: internal_job_variable.key, value: internal_job_variable.value))
       end
     end
 
@@ -170,7 +154,7 @@ RSpec.describe Ci::RetryBuildService do
         Ci::Build.attribute_names.map(&:to_sym) +
         Ci::Build.attribute_aliases.keys.map(&:to_sym) +
         Ci::Build.reflect_on_all_associations.map(&:name) +
-        [:tag_list, :needs_attributes] -
+        [:tag_list, :needs_attributes, :job_variables_attributes] -
         # ee-specific accessors should be tested in ee/spec/services/ci/retry_build_service_spec.rb instead
         described_class.extra_accessors -
         [:dast_site_profiles_build, :dast_scanner_profiles_build] # join tables
diff --git a/spec/services/loose_foreign_keys/batch_cleaner_service_spec.rb b/spec/services/loose_foreign_keys/batch_cleaner_service_spec.rb
index ac9b01be0b5..d3d57ea2444 100644
--- a/spec/services/loose_foreign_keys/batch_cleaner_service_spec.rb
+++ b/spec/services/loose_foreign_keys/batch_cleaner_service_spec.rb
@@ -90,7 +90,7 @@ RSpec.describe LooseForeignKeys::BatchCleanerService do
 
       described_class.new(parent_table: '_test_loose_fk_parent_table',
                           loose_foreign_key_definitions: loose_foreign_key_definitions,
-                          deleted_parent_records: LooseForeignKeys::DeletedRecord.status_pending.all
+                          deleted_parent_records: LooseForeignKeys::DeletedRecord.load_batch_for_table('public._test_loose_fk_parent_table', 100)
                          ).execute
     end
 
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index ad85e97c333..d7a36ff370e 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -569,6 +569,27 @@ RSpec.describe SearchService do
     end
   end
 
+  describe '#abuse_messages' do
+    let(:scope) { 'issues' }
+    let(:search) { 'foobar' }
+    let(:params) { instance_double(Gitlab::Search::Params) }
+
+    before do
+      allow(Gitlab::Search::Params).to receive(:new).and_return(params)
+    end
+
+    it 'returns an empty array when not abusive' do
+      allow(params).to receive(:abusive?).and_return false
+      expect(subject.abuse_messages).to match_array([])
+    end
+
+    it 'calls on abuse_detection.errors.full_messages when abusive' do
+      allow(params).to receive(:abusive?).and_return true
+      expect(params).to receive_message_chain(:abuse_detection, :errors, :full_messages)
+      subject.abuse_messages
+    end
+  end
+
   describe 'abusive search handling' do
     subject { described_class.new(user, raw_params) }