3 files changed, 55 insertions, 48 deletions
diff --git a/spec/lib/gitlab/import/set_async_jid_spec.rb b/spec/lib/gitlab/import/set_async_jid_spec.rb
index 016f7cac61a..6931a7a953d 100644
--- a/spec/lib/gitlab/import/set_async_jid_spec.rb
+++ b/spec/lib/gitlab/import/set_async_jid_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Import::SetAsyncJid do
     it 'sets the JID in Redis' do
       expect(Gitlab::SidekiqStatus)
         .to receive(:set)
-              .with("async-import/project-import-state/#{project.id}", Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION, value: 2)
+              .with("async-import/project-import-state/#{project.id}", Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
               .and_call_original
 
       described_class.set_jid(project.import_state)
diff --git a/spec/lib/gitlab/sidekiq_status/client_middleware_spec.rb b/spec/lib/gitlab/sidekiq_status/client_middleware_spec.rb
index 2f2499753b9..cb1616ec40a 100644
--- a/spec/lib/gitlab/sidekiq_status/client_middleware_spec.rb
+++ b/spec/lib/gitlab/sidekiq_status/client_middleware_spec.rb
@@ -1,24 +1,61 @@
 # frozen_string_literal: true
 
-require 'fast_spec_helper'
+# This can use fast_spec_helper when the feature flag stubbing is removed.
+require 'spec_helper'
 
-RSpec.describe Gitlab::SidekiqStatus::ClientMiddleware do
+RSpec.describe Gitlab::SidekiqStatus::ClientMiddleware, :clean_gitlab_redis_queues do
   describe '#call' do
-    context 'when the job has status_expiration set' do
-      it 'tracks the job in Redis with a value of 2' do
-        expect(Gitlab::SidekiqStatus).to receive(:set).with('123', 1.hour.to_i, value: 2)
+    context 'when opt_in_sidekiq_status is disabled' do
+      before do
+        stub_feature_flags(opt_in_sidekiq_status: false)
+      end
+
+      context 'when the job has status_expiration set' do
+        it 'tracks the job in Redis' do
+          expect(Gitlab::SidekiqStatus).to receive(:set).with('123', 1.hour.to_i).and_call_original
+
+          described_class.new
+            .call('Foo', { 'jid' => '123', 'status_expiration' => 1.hour.to_i }, double(:queue), double(:pool)) { nil }
+
+          expect(Gitlab::SidekiqStatus.num_running(['123'])).to eq(1)
+        end
+      end
+
+      context 'when the job does not have status_expiration set' do
+        it 'tracks the job in Redis' do
+          expect(Gitlab::SidekiqStatus).to receive(:set).with('123', 30.minutes.to_i).and_call_original
+
+          described_class.new
+            .call('Foo', { 'jid' => '123' }, double(:queue), double(:pool)) { nil }
 
-        described_class.new
-          .call('Foo', { 'jid' => '123', 'status_expiration' => 1.hour.to_i }, double(:queue), double(:pool)) { nil }
+          expect(Gitlab::SidekiqStatus.num_running(['123'])).to eq(1)
+        end
       end
     end
 
-    context 'when the job does not have status_expiration set' do
-      it 'tracks the job in Redis with a value of 1' do
-        expect(Gitlab::SidekiqStatus).to receive(:set).with('123', Gitlab::SidekiqStatus::DEFAULT_EXPIRATION, value: 1)
+    context 'when opt_in_sidekiq_status is enabled' do
+      before do
+        stub_feature_flags(opt_in_sidekiq_status: true)
+      end
+
+      context 'when the job has status_expiration set' do
+        it 'tracks the job in Redis' do
+          expect(Gitlab::SidekiqStatus).to receive(:set).with('123', 1.hour.to_i).and_call_original
+
+          described_class.new
+            .call('Foo', { 'jid' => '123', 'status_expiration' => 1.hour.to_i }, double(:queue), double(:pool)) { nil }
+
+          expect(Gitlab::SidekiqStatus.num_running(['123'])).to eq(1)
+        end
+      end
+
+      context 'when the job does not have status_expiration set' do
+        it 'does not track the job in Redis' do
+          described_class.new
+            .call('Foo', { 'jid' => '123' }, double(:queue), double(:pool)) { nil }
 
-        described_class.new
-          .call('Foo', { 'jid' => '123' }, double(:queue), double(:pool)) { nil }
+          expect(Gitlab::SidekiqStatus.num_running(['123'])).to be_zero
+        end
       end
     end
   end
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