Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 14 deletions

diff --git a/spec/workers/build_hooks_worker_spec.rb b/spec/workers/build_hooks_worker_spec.rb
index 62e1a4fd294..5f7e7e5fb00 100644
--- a/spec/workers/build_hooks_worker_spec.rb
+++ b/spec/workers/build_hooks_worker_spec.rb
@@ -24,20 +24,8 @@ RSpec.describe BuildHooksWorker do
   end
 
   describe '.perform_async' do
-    context 'when delayed_perform_for_build_hooks_worker feature flag is disabled' do
-      before do
-        stub_feature_flags(delayed_perform_for_build_hooks_worker: false)
-      end
-
-      it 'delays scheduling a job by calling perform_in with default delay' do
-        expect(described_class).to receive(:perform_in).with(ApplicationWorker::DEFAULT_DELAY_INTERVAL.second, 123)
-
-        described_class.perform_async(123)
-      end
-    end
-
-    it 'delays scheduling a job by calling perform_in' do
-      expect(described_class).to receive(:perform_in).with(described_class::DATA_CONSISTENCY_DELAY.second, 123)
+    it 'delays scheduling a job by calling perform_in with default delay' do
+      expect(described_class).to receive(:perform_in).with(ApplicationWorker::DEFAULT_DELAY_INTERVAL.second, 123)
 
       described_class.perform_async(123)
     end