Add latest changes from gitlab-org/gitlab@master

2 files changed, 34 insertions, 0 deletions

diff --git a/spec/migrations/backfill_epic_cache_counts_spec.rb b/spec/migrations/backfill_epic_cache_counts_spec.rb
new file mode 100644
index 00000000000..6084fdad0a6
--- /dev/null
+++ b/spec/migrations/backfill_epic_cache_counts_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe BackfillEpicCacheCounts, :migration do
+  let(:migration) { described_class::MIGRATION }
+
+  describe '#up' do
+    it 'schedules a batched background migration' do
+      migrate!
+
+      expect(migration).to have_scheduled_batched_migration(
+        table_name: :epics,
+        column_name: :id,
+        interval: described_class::DELAY_INTERVAL,
+        batch_size: described_class::BATCH_SIZE,
+        max_batch_size: described_class::MAX_BATCH_SIZE,
+        sub_batch_size: described_class::SUB_BATCH_SIZE
+      )
+    end
+  end
+
+  describe '#down' do
+    it 'deletes all batched migration records' do
+      migrate!
+      schema_migrate_down!
+
+      expect(migration).not_to have_scheduled_batched_migration
+    end
+  end
+end
diff --git a/spec/services/web_hooks/log_execution_service_spec.rb b/spec/services/web_hooks/log_execution_service_spec.rb
index 1967a8368fb..7e3f33c5fbb 100644
--- a/spec/services/web_hooks/log_execution_service_spec.rb
+++ b/spec/services/web_hooks/log_execution_service_spec.rb
@@ -69,6 +69,8 @@ RSpec.describe WebHooks::LogExecutionService do
           subject(:service) { described_class.new(hook: project_hook, log_data: data, response_category: response_category) }
 
           before do
+            # stub LOCK_RETRY to be 0 in order for tests to run quicker
+            stub_const("#{described_class.name}::LOCK_RETRY", 0)
             stub_exclusive_lease_taken(lease_key, timeout: described_class::LOCK_TTL)
             allow(project_hook).to receive(:executable?).and_return(executable)
           end