1 files changed, 88 insertions, 1 deletions
diff --git a/spec/lib/feature_spec.rb b/spec/lib/feature_spec.rb
index a7163048370..3d59b1f35a9 100644
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Feature do
@@ -31,7 +33,8 @@ describe Feature do
       expect(described_class.persisted_names).to be_empty
     end
 
-    it 'caches the feature names when request store is active', :request_store do
+    it 'caches the feature names when request store is active',
+       :request_store, :use_clean_rails_memory_store_caching do
       Feature::FlipperFeature.create!(key: 'foo')
 
       expect(Feature::FlipperFeature)
@@ -39,6 +42,12 @@ describe Feature do
         .once
         .and_call_original
 
+      expect(Gitlab::ThreadMemoryCache.cache_backend)
+        .to receive(:fetch)
+        .once
+        .with('flipper:persisted_names', expires_in: 1.minute)
+        .and_call_original
+
       2.times do
         expect(described_class.persisted_names).to eq(%w[foo])
       end
@@ -137,6 +146,68 @@ describe Feature do
       expect(described_class.enabled?(:enabled_feature_flag)).to be_truthy
     end
 
+    it { expect(described_class.l1_cache_backend).to eq(Gitlab::ThreadMemoryCache.cache_backend) }
+    it { expect(described_class.l2_cache_backend).to eq(Rails.cache) }
+
+    it 'caches the status in L1 and L2 caches',
+       :request_store, :use_clean_rails_memory_store_caching do
+      described_class.enable(:enabled_feature_flag)
+      flipper_key = "flipper/v1/feature/enabled_feature_flag"
+
+      expect(described_class.l2_cache_backend)
+        .to receive(:fetch)
+        .once
+        .with(flipper_key, expires_in: 1.hour)
+        .and_call_original
+
+      expect(described_class.l1_cache_backend)
+        .to receive(:fetch)
+        .once
+        .with(flipper_key, expires_in: 1.minute)
+        .and_call_original
+
+      2.times do
+        expect(described_class.enabled?(:enabled_feature_flag)).to be_truthy
+      end
+    end
+
+    context 'cached feature flag', :request_store do
+      let(:flag) { :some_feature_flag }
+
+      before do
+        described_class.flipper.memoize = false
+        described_class.enabled?(flag)
+      end
+
+      it 'caches the status in L1 cache for the first minute' do
+        expect do
+          expect(described_class.l1_cache_backend).to receive(:fetch).once.and_call_original
+          expect(described_class.l2_cache_backend).not_to receive(:fetch)
+          expect(described_class.enabled?(flag)).to be_truthy
+        end.not_to exceed_query_limit(0)
+      end
+
+      it 'caches the status in L2 cache after 2 minutes' do
+        Timecop.travel 2.minutes do
+          expect do
+            expect(described_class.l1_cache_backend).to receive(:fetch).once.and_call_original
+            expect(described_class.l2_cache_backend).to receive(:fetch).once.and_call_original
+            expect(described_class.enabled?(flag)).to be_truthy
+          end.not_to exceed_query_limit(0)
+        end
+      end
+
+      it 'fetches the status after an hour' do
+        Timecop.travel 61.minutes do
+          expect do
+            expect(described_class.l1_cache_backend).to receive(:fetch).once.and_call_original
+            expect(described_class.l2_cache_backend).to receive(:fetch).once.and_call_original
+            expect(described_class.enabled?(flag)).to be_truthy
+          end.not_to exceed_query_limit(1)
+        end
+      end
+    end
+
     context 'with an individual actor' do
       CustomActor = Struct.new(:flipper_id)
 
@@ -183,6 +254,22 @@ describe Feature do
     end
   end
 
+  describe '.remove' do
+    context 'for a non-persisted feature' do
+      it 'returns nil' do
+        expect(described_class.remove(:non_persisted_feature_flag)).to be_nil
+      end
+    end
+
+    context 'for a persisted feature' do
+      it 'returns true' do
+        described_class.enable(:persisted_feature_flag)
+
+        expect(described_class.remove(:persisted_feature_flag)).to be_truthy
+      end
+    end
+  end
+
   describe Feature::Target do
     describe '#targets' do
       let(:project) { create(:project) }