Merge branch 'da-fix-cache-for-broadcast-message' into 'master'
Set 2 weeks as the expiration time for the current broadcast message See merge request gitlab-org/gitlab-ce!30062
This commit is contained in:
commit
3221f1a758
|
@ -45,7 +45,7 @@ class BroadcastMessage < ApplicationRecord
|
|||
end
|
||||
|
||||
def self.cache_expires_in
|
||||
nil
|
||||
2.weeks
|
||||
end
|
||||
|
||||
def active?
|
||||
|
|
|
@ -48,14 +48,14 @@ describe BroadcastMessage do
|
|||
expect(described_class.current).to be_empty
|
||||
end
|
||||
|
||||
it 'caches the output of the query' do
|
||||
it 'caches the output of the query for two weeks' do
|
||||
create(:broadcast_message)
|
||||
|
||||
expect(described_class).to receive(:current_and_future_messages).and_call_original.once
|
||||
expect(described_class).to receive(:current_and_future_messages).and_call_original.twice
|
||||
|
||||
described_class.current
|
||||
|
||||
Timecop.travel(1.year) do
|
||||
Timecop.travel(3.weeks) do
|
||||
described_class.current
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue