kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix specs in spec/models/concerns/cacheable_attributes_spec.rb

This commit is contained in:
Stan Hu 2019-07-01 15:11:53 -07:00
parent 978647c6cb
commit 07f879f890
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spec/models/concerns/cacheable_attributes_spec.rb
View File

@ -143,14 +143,14 @@ describe CacheableAttributes do
allow(ApplicationSetting).to receive(:current_without_cache).twice.and_return(nil) allow(ApplicationSetting).to receive(:current_without_cache).twice.and_return(nil)
expect(ApplicationSetting.current).to be_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 end
it 'caches non-nil object' do it 'caches non-nil object' do
create(:application_setting) create(:application_setting)
expect(ApplicationSetting.current).to eq(ApplicationSetting.last) 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 # subsequent calls retrieve the record from the cache
last_record = ApplicationSetting.last last_record = ApplicationSetting.last
@ -188,11 +188,12 @@ describe CacheableAttributes do
end end
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 # Warm up the cache
create(:application_setting).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 } 2.times { ApplicationSetting.current }
end end