Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 2 insertions, 14 deletions

diff --git a/spec/lib/gitlab/database/load_balancing_spec.rb b/spec/lib/gitlab/database/load_balancing_spec.rb
index e7de7f2b43b..94717a10492 100644
--- a/spec/lib/gitlab/database/load_balancing_spec.rb
+++ b/spec/lib/gitlab/database/load_balancing_spec.rb
@@ -142,10 +142,10 @@ RSpec.describe Gitlab::Database::LoadBalancing do
       expect(described_class.enable?).to eq(false)
     end
 
-    it 'returns false when Sidekiq is being used' do
+    it 'returns true when Sidekiq is being used' do
       allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true)
 
-      expect(described_class.enable?).to eq(false)
+      expect(described_class.enable?).to eq(true)
     end
 
     it 'returns false when running inside a Rake task' do
@@ -170,18 +170,6 @@ RSpec.describe Gitlab::Database::LoadBalancing do
 
       expect(described_class.enable?).to eq(true)
     end
-
-    context 'when ENABLE_LOAD_BALANCING_FOR_SIDEKIQ environment variable is set' do
-      before do
-        stub_env('ENABLE_LOAD_BALANCING_FOR_SIDEKIQ', 'true')
-      end
-
-      it 'returns true when Sidekiq is being used' do
-        allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true)
-
-        expect(described_class.enable?).to eq(true)
-      end
-    end
   end
 
   describe '.configured?' do