Merge branch...

Merge branch '224097-flaky-elasticindexerworker-specs-fail-for-400-error-ee-spec-workers' into 'master'

Improve the en/dis-ablement of the ES feature in a flaky test

Closes #224097

See merge request gitlab-org/gitlab!36326

ee/spec/workers/elastic_namespace_indexer_worker_spec.rb

@@ -2,21 +2,27 @@
 
 require 'spec_helper'
 
-RSpec.describe ElasticNamespaceIndexerWorker, :elastic do
+RSpec.describe ElasticNamespaceIndexerWorker do
   subject { described_class.new }
 
+  context 'when ES is disabled' do
     before do
-    stub_ee_application_setting(elasticsearch_indexing: true)
-    stub_ee_application_setting(elasticsearch_limit_indexing: true)
-  end
-
-  it 'returns true if ES disabled' do
       stub_ee_application_setting(elasticsearch_indexing: false)
+      stub_ee_application_setting(elasticsearch_limit_indexing: false)
+    end
 
+    it 'returns true' do
       expect(Elastic::ProcessInitialBookkeepingService).not_to receive(:backfill_projects!)
 
       expect(subject.perform(1, "index")).to be_truthy
     end
+  end
+
+  context 'when ES is enabled', :elastic do
+    before do
+      stub_ee_application_setting(elasticsearch_indexing: true)
+      stub_ee_application_setting(elasticsearch_limit_indexing: true)
+    end
 
     it 'returns true if limited indexing is not enabled' do
       stub_ee_application_setting(elasticsearch_limit_indexing: false)
@@ -43,4 +49,5 @@ RSpec.describe ElasticNamespaceIndexerWorker, :elastic do
         subject.perform(namespace.id, :delete)
       end
     end
+  end
 end