diff options
author | Stan Hu <stanhu@gmail.com> | 2019-07-01 15:11:53 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-07-01 22:23:01 -0700 |
commit | 07f879f8909572a13256b8a7c5d8cf3c9d16a230 (patch) | |
tree | d70b87044218189556da8af2ea5fb47659c08bf6 | |
parent | 978647c6cb0f81c3695c4d20e98619c2025532c5 (diff) | |
download | gitlab-ce-07f879f8909572a13256b8a7c5d8cf3c9d16a230.tar.gz |
Fix specs in spec/models/concerns/cacheable_attributes_spec.rb
-rw-r--r-- | spec/models/concerns/cacheable_attributes_spec.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/models/concerns/cacheable_attributes_spec.rb b/spec/models/concerns/cacheable_attributes_spec.rb index 394fac52aa7..eeacdadab9c 100644 --- a/spec/models/concerns/cacheable_attributes_spec.rb +++ b/spec/models/concerns/cacheable_attributes_spec.rb @@ -143,14 +143,14 @@ describe CacheableAttributes do allow(ApplicationSetting).to receive(:current_without_cache).twice.and_return(nil) expect(ApplicationSetting.current).to be_nil - expect(Rails.cache.exist?(ApplicationSetting.cache_key)).to be(false) + expect(ApplicationSetting.cache_backend.exist?(ApplicationSetting.cache_key)).to be(false) end it 'caches non-nil object' do create(:application_setting) expect(ApplicationSetting.current).to eq(ApplicationSetting.last) - expect(Rails.cache.exist?(ApplicationSetting.cache_key)).to be(true) + expect(ApplicationSetting.cache_backend.exist?(ApplicationSetting.cache_key)).to be(true) # subsequent calls retrieve the record from the cache last_record = ApplicationSetting.last @@ -188,11 +188,12 @@ describe CacheableAttributes do end end - it 'uses RequestStore in addition to Rails.cache', :request_store do + it 'uses RequestStore in addition to Thread memory cache', :request_store do # Warm up the cache create(:application_setting).cache! - expect(Rails.cache).to receive(:read).with(ApplicationSetting.cache_key).once.and_call_original + expect(ApplicationSetting.cache_backend).to eq(Gitlab::ThreadMemoryCache.cache_backend) + expect(ApplicationSetting.cache_backend).to receive(:read).with(ApplicationSetting.cache_key).once.and_call_original 2.times { ApplicationSetting.current } end |