Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 5 insertions, 35 deletions

diff --git a/spec/lib/gitlab/sidekiq_status_spec.rb b/spec/lib/gitlab/sidekiq_status_spec.rb
index 1e7b52471b0..c94deb8e008 100644
--- a/spec/lib/gitlab/sidekiq_status_spec.rb
+++ b/spec/lib/gitlab/sidekiq_status_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Gitlab::SidekiqStatus, :clean_gitlab_redis_queues, :clean_gitlab_
       Sidekiq.redis do |redis|
         expect(redis.exists(key)).to eq(true)
         expect(redis.ttl(key) > 0).to eq(true)
-        expect(redis.get(key)).to eq(described_class::DEFAULT_VALUE.to_s)
+        expect(redis.get(key)).to eq('1')
       end
     end
 
@@ -24,19 +24,17 @@ RSpec.describe Gitlab::SidekiqStatus, :clean_gitlab_redis_queues, :clean_gitlab_
       Sidekiq.redis do |redis|
         expect(redis.exists(key)).to eq(true)
         expect(redis.ttl(key) > described_class::DEFAULT_EXPIRATION).to eq(true)
-        expect(redis.get(key)).to eq(described_class::DEFAULT_VALUE.to_s)
+        expect(redis.get(key)).to eq('1')
       end
     end
 
-    it 'allows overriding the default value' do
-      described_class.set('123', value: 2)
+    it 'does not store anything with a nil expiry' do
+      described_class.set('123', nil)
 
       key = described_class.key_for('123')
 
       Sidekiq.redis do |redis|
-        expect(redis.exists(key)).to eq(true)
-        expect(redis.ttl(key) > 0).to eq(true)
-        expect(redis.get(key)).to eq('2')
+        expect(redis.exists(key)).to eq(false)
       end
     end
   end
@@ -138,33 +136,5 @@ RSpec.describe Gitlab::SidekiqStatus, :clean_gitlab_redis_queues, :clean_gitlab_
     it 'handles an empty array' do
       expect(described_class.job_status([])).to eq([])
     end
-
-    context 'when log_implicit_sidekiq_status_calls is enabled' do
-      it 'logs keys that contained the default value' do
-        described_class.set('123', value: 2)
-        described_class.set('456')
-        described_class.set('012')
-
-        expect(Sidekiq.logger).to receive(:info).with(message: described_class::DEFAULT_VALUE_MESSAGE,
-                                                      keys: [described_class.key_for('456'), described_class.key_for('012')])
-
-        expect(described_class.job_status(%w(123 456 789 012))).to eq([true, true, false, true])
-      end
-    end
-
-    context 'when log_implicit_sidekiq_status_calls is disabled' do
-      before do
-        stub_feature_flags(log_implicit_sidekiq_status_calls: false)
-      end
-
-      it 'does not perform any logging' do
-        described_class.set('123', value: 2)
-        described_class.set('456')
-
-        expect(Sidekiq.logger).not_to receive(:info)
-
-        expect(described_class.job_status(%w(123 456 789))).to eq([true, true, false])
-      end
-    end
   end
 end