Merge branch 'ee-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-ee!14379

app/models/broadcast_message.rb

@@ -45,7 +45,7 @@ class BroadcastMessage < ApplicationRecord
   end
 
   def self.cache_expires_in
-    nil
+    2.weeks
   end
 
   def active?

ee/spec/models/broadcast_message_spec.rb

@@ -5,16 +5,16 @@ describe BroadcastMessage do
 
   describe '.current', :use_clean_rails_memory_store_caching do
     context 'without Geo' do
-      it 'caches the output for a long time' do
+      it 'caches the output of the query for two weeks' do
         expect(Gitlab::Geo).to receive(:enabled?).and_return(false).exactly(2).times
 
         create(:broadcast_message)
 
-        expect(described_class).to receive(:where).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
@@ -22,16 +22,16 @@ describe BroadcastMessage do
 
     context 'with Geo' do
       context 'on the primary' do
-        it 'caches the output for a long time' do
-          expect(Gitlab::Geo).to receive(:secondary?).and_return(false).exactly(2).times
+        it 'caches the output of the query for two weeks' do
+          expect(Gitlab::Geo).to receive(:enabled?).and_return(false).exactly(2).times
 
           create(:broadcast_message)
 
-          expect(described_class).to receive(:where).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

spec/models/broadcast_message_spec.rb

@@ -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