3 files changed, 28 insertions, 16 deletions
diff --git a/spec/lib/gitlab/redis/cache_spec.rb b/spec/lib/gitlab/redis/cache_spec.rb
index 31141ac1139..1f0ebbe107f 100644
--- a/spec/lib/gitlab/redis/cache_spec.rb
+++ b/spec/lib/gitlab/redis/cache_spec.rb
@@ -15,4 +15,16 @@ RSpec.describe Gitlab::Redis::Cache do
       expect(subject.send(:raw_config_hash)).to eq(url: 'redis://localhost:6380' )
     end
   end
+
+  describe '.active_support_config' do
+    it 'has a default ttl of 2 weeks' do
+      expect(described_class.active_support_config[:expires_in]).to eq(2.weeks)
+    end
+
+    it 'allows configuring the TTL through an env variable' do
+      stub_env('GITLAB_RAILS_CACHE_DEFAULT_TTL_SECONDS' => '86400')
+
+      expect(described_class.active_support_config[:expires_in]).to eq(1.day)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/redis/hll_spec.rb b/spec/lib/gitlab/redis/hll_spec.rb
index e452e5b2f52..9cd339239bb 100644
--- a/spec/lib/gitlab/redis/hll_spec.rb
+++ b/spec/lib/gitlab/redis/hll_spec.rb
@@ -64,10 +64,10 @@ RSpec.describe Gitlab::Redis::HLL, :clean_gitlab_redis_shared_state do
     let(:event_2020_33) { '2020-33-{expand_vulnerabilities}' }
     let(:event_2020_34) { '2020-34-{expand_vulnerabilities}' }
 
-    let(:entity1) { 'user_id_1'}
-    let(:entity2) { 'user_id_2'}
-    let(:entity3) { 'user_id_3'}
-    let(:entity4) { 'user_id_4'}
+    let(:entity1) { 'user_id_1' }
+    let(:entity2) { 'user_id_2' }
+    let(:entity3) { 'user_id_3' }
+    let(:entity4) { 'user_id_4' }
 
     before do
       track_event(event_2020_32, entity1)
diff --git a/spec/lib/gitlab/redis/multi_store_spec.rb b/spec/lib/gitlab/redis/multi_store_spec.rb
index 50ebf43a05e..ef8549548d7 100644
--- a/spec/lib/gitlab/redis/multi_store_spec.rb
+++ b/spec/lib/gitlab/redis/multi_store_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
   let_it_be(:primary_store) { create_redis_store(redis_store_class.params, db: primary_db, serializer: nil) }
   let_it_be(:secondary_store) { create_redis_store(redis_store_class.params, db: secondary_db, serializer: nil) }
   let_it_be(:instance_name) { 'TestStore' }
-  let_it_be(:multi_store) { described_class.new(primary_store, secondary_store, instance_name)}
+  let_it_be(:multi_store) { described_class.new(primary_store, secondary_store, instance_name) }
 
   subject { multi_store.send(name, *args) }
 
@@ -38,7 +38,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
   end
 
   context 'when primary_store is nil' do
-    let(:multi_store) { described_class.new(nil, secondary_store, instance_name)}
+    let(:multi_store) { described_class.new(nil, secondary_store, instance_name) }
 
     it 'fails with exception' do
       expect { multi_store }.to raise_error(ArgumentError, /primary_store is required/)
@@ -46,7 +46,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
   end
 
   context 'when secondary_store is nil' do
-    let(:multi_store) { described_class.new(primary_store, nil, instance_name)}
+    let(:multi_store) { described_class.new(primary_store, nil, instance_name) }
 
     it 'fails with exception' do
       expect { multi_store }.to raise_error(ArgumentError, /secondary_store is required/)
@@ -55,7 +55,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
 
   context 'when instance_name is nil' do
     let(:instance_name) { nil }
-    let(:multi_store) { described_class.new(primary_store, secondary_store, instance_name)}
+    let(:multi_store) { described_class.new(primary_store, secondary_store, instance_name) }
 
     it 'fails with exception' do
       expect { multi_store }.to raise_error(ArgumentError, /instance_name is required/)
@@ -111,8 +111,8 @@ RSpec.describe Gitlab::Redis::MultiStore do
   context 'with READ redis commands' do
     let_it_be(:key1) { "redis:{1}:key_a" }
     let_it_be(:key2) { "redis:{1}:key_b" }
-    let_it_be(:value1) { "redis_value1"}
-    let_it_be(:value2) { "redis_value2"}
+    let_it_be(:value1) { "redis_value1" }
+    let_it_be(:value2) { "redis_value2" }
     let_it_be(:skey) { "redis:set:key" }
     let_it_be(:keys) { [key1, key2] }
     let_it_be(:values) { [value1, value2] }
@@ -330,7 +330,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
         context 'with both primary and secondary store using same redis instance' do
           let(:primary_store) { create_redis_store(redis_store_class.params, db: primary_db, serializer: nil) }
           let(:secondary_store) { create_redis_store(redis_store_class.params, db: primary_db, serializer: nil) }
-          let(:multi_store) { described_class.new(primary_store, secondary_store, instance_name)}
+          let(:multi_store) { described_class.new(primary_store, secondary_store, instance_name) }
 
           it_behaves_like 'secondary store'
         end
@@ -356,8 +356,8 @@ RSpec.describe Gitlab::Redis::MultiStore do
   context 'with WRITE redis commands' do
     let_it_be(:key1) { "redis:{1}:key_a" }
     let_it_be(:key2) { "redis:{1}:key_b" }
-    let_it_be(:value1) { "redis_value1"}
-    let_it_be(:value2) { "redis_value2"}
+    let_it_be(:value1) { "redis_value1" }
+    let_it_be(:value2) { "redis_value2" }
     let_it_be(:key1_value1) { [key1, value1] }
     let_it_be(:key1_value2) { [key1, value2] }
     let_it_be(:ttl) { 10 }
@@ -395,7 +395,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
 
     with_them do
       describe "#{name}" do
-        let(:expected_args) {args || no_args }
+        let(:expected_args) { args || no_args }
 
         before do
           allow(primary_store).to receive(name).and_call_original
@@ -496,8 +496,8 @@ RSpec.describe Gitlab::Redis::MultiStore do
 
   RSpec.shared_examples_for 'pipelined command' do |name|
     let_it_be(:key1) { "redis:{1}:key_a" }
-    let_it_be(:value1) { "redis_value1"}
-    let_it_be(:value2) { "redis_value2"}
+    let_it_be(:value1) { "redis_value1" }
+    let_it_be(:value2) { "redis_value2" }
     let_it_be(:expected_value) { value1 }
     let_it_be(:verification_name) { :get }
     let_it_be(:verification_args) { key1 }