Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/models/broadcast_message_spec.rb b/spec/models/broadcast_message_spec.rb
index 67d8284bebe..6cef81d6e44 100644
--- a/spec/models/broadcast_message_spec.rb
+++ b/spec/models/broadcast_message_spec.rb
@@ -65,6 +65,17 @@ describe BroadcastMessage do
       end
     end
 
+    it 'expires the value if a broadcast message has ended', :request_store do
+      message = create(:broadcast_message, broadcast_type: broadcast_type, ends_at: Time.now.utc + 1.day)
+
+      expect(subject.call).to match_array([message])
+      expect(described_class.cache).to receive(:expire).and_call_original
+
+      Timecop.travel(1.week) do
+        2.times { expect(subject.call).to be_empty }
+      end
+    end
+
     it 'does not create new records' do
       create(:broadcast_message, broadcast_type: broadcast_type)