Add latest changes from gitlab-org/gitlab@master

2 files changed, 35 insertions, 10 deletions

diff --git a/spec/workers/concerns/worker_attributes_spec.rb b/spec/workers/concerns/worker_attributes_spec.rb
index ac9d3fa824e..cee8e0fb0ad 100644
--- a/spec/workers/concerns/worker_attributes_spec.rb
+++ b/spec/workers/concerns/worker_attributes_spec.rb
@@ -37,6 +37,7 @@ RSpec.describe WorkerAttributes, feature_category: :shared do
       :worker_has_external_dependencies? | :worker_has_external_dependencies! | false            | []                                 | true
       :idempotent?                       | :idempotent!                       | false            | []                                 | true
       :big_payload?                      | :big_payload!                      | false            | []                                 | true
+      :database_health_check_attrs       | :defer_on_database_health_signal   | nil              | [:gitlab_main, 1.minute, [:users]] | { gitlab_schema: :gitlab_main, delay_by: 1.minute, tables: [:users] }
     end
     # rubocop: enable Layout/LineLength
 
@@ -141,4 +142,38 @@ RSpec.describe WorkerAttributes, feature_category: :shared do
       end
     end
   end
+
+  describe '#defer_on_database_health_signal?' do
+    subject(:defer_on_database_health_signal?) { worker.defer_on_database_health_signal? }
+
+    context 'when defer_on_database_health_signal is set' do
+      before do
+        worker.defer_on_database_health_signal(:gitlab_main, 1.minute, [:users])
+      end
+
+      it { is_expected.to be(true) }
+    end
+
+    context 'when defer_on_database_health_signal is not set' do
+      it { is_expected.to be(false) }
+    end
+
+    context 'when FF `defer_sidekiq_workers_on_database_health_signal` is disabled' do
+      before do
+        stub_feature_flags(defer_sidekiq_workers_on_database_health_signal: false)
+      end
+
+      context 'when defer_on_database_health_signal is set' do
+        before do
+          worker.defer_on_database_health_signal(:gitlab_main, 1.minute, [:users])
+        end
+
+        it { is_expected.to be(false) }
+      end
+
+      context 'when defer_on_database_health_signal is not set' do
+        it { is_expected.to be(false) }
+      end
+    end
+  end
 end
diff --git a/spec/workers/packages/cleanup/delete_orphaned_dependencies_worker_spec.rb b/spec/workers/packages/cleanup/delete_orphaned_dependencies_worker_spec.rb
index ffa7767075e..73a28053cc5 100644
--- a/spec/workers/packages/cleanup/delete_orphaned_dependencies_worker_spec.rb
+++ b/spec/workers/packages/cleanup/delete_orphaned_dependencies_worker_spec.rb
@@ -104,15 +104,5 @@ RSpec.describe Packages::Cleanup::DeleteOrphanedDependenciesWorker, feature_cate
         subject
       end
     end
-
-    context 'when the FF is disabled' do
-      before do
-        stub_feature_flags(packages_delete_orphaned_dependencies_worker: false)
-      end
-
-      it 'does not execute the worker' do
-        expect { subject }.not_to change { Packages::Dependency.count }
-      end
-    end
   end
 end