Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 21 insertions, 38 deletions

diff --git a/spec/lib/gitlab/performance_bar_spec.rb b/spec/lib/gitlab/performance_bar_spec.rb
index 816db49d94a..7b79cc82816 100644
--- a/spec/lib/gitlab/performance_bar_spec.rb
+++ b/spec/lib/gitlab/performance_bar_spec.rb
@@ -3,42 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::PerformanceBar do
-  shared_examples 'allowed user IDs are cached' do
-    before do
-      # Warm the caches
-      described_class.enabled_for_user?(user)
-    end
-
-    it 'caches the allowed user IDs in cache', :use_clean_rails_memory_store_caching do
-      expect do
-        expect(described_class.l1_cache_backend).to receive(:fetch).and_call_original
-        expect(described_class.l2_cache_backend).not_to receive(:fetch)
-        expect(described_class.enabled_for_user?(user)).to be_truthy
-      end.not_to exceed_query_limit(0)
-    end
-
-    it 'caches the allowed user IDs in L1 cache for 1 minute', :use_clean_rails_memory_store_caching do
-      Timecop.travel 2.minutes do
-        expect do
-          expect(described_class.l1_cache_backend).to receive(:fetch).and_call_original
-          expect(described_class.l2_cache_backend).to receive(:fetch).and_call_original
-          expect(described_class.enabled_for_user?(user)).to be_truthy
-        end.not_to exceed_query_limit(0)
-      end
-    end
-
-    it 'caches the allowed user IDs in L2 cache for 5 minutes', :use_clean_rails_memory_store_caching do
-      Timecop.travel 6.minutes do
-        expect do
-          expect(described_class.l1_cache_backend).to receive(:fetch).and_call_original
-          expect(described_class.l2_cache_backend).to receive(:fetch).and_call_original
-          expect(described_class.enabled_for_user?(user)).to be_truthy
-        end.not_to exceed_query_limit(2)
-      end
-    end
-  end
-
-  it { expect(described_class.l1_cache_backend).to eq(Gitlab::ThreadMemoryCache.cache_backend) }
+  it { expect(described_class.l1_cache_backend).to eq(Gitlab::ProcessMemoryCache.cache_backend) }
   it { expect(described_class.l2_cache_backend).to eq(Rails.cache) }
 
   describe '.enabled_for_user?' do
@@ -82,7 +47,16 @@ describe Gitlab::PerformanceBar do
           expect(described_class.enabled_for_user?(user)).to be_falsy
         end
 
-        it_behaves_like 'allowed user IDs are cached'
+        context 'caching of allowed user IDs' do
+          subject { described_class.enabled_for_user?(user) }
+
+          before do
+            # Warm the caches
+            described_class.enabled_for_user?(user)
+          end
+
+          it_behaves_like 'allowed user IDs are cached'
+        end
       end
 
       context 'when user is a member of the allowed group' do
@@ -94,7 +68,16 @@ describe Gitlab::PerformanceBar do
           expect(described_class.enabled_for_user?(user)).to be_truthy
         end
 
-        it_behaves_like 'allowed user IDs are cached'
+        context 'caching of allowed user IDs' do
+          subject { described_class.enabled_for_user?(user) }
+
+          before do
+            # Warm the caches
+            described_class.enabled_for_user?(user)
+          end
+
+          it_behaves_like 'allowed user IDs are cached'
+        end
       end
     end