diff options
author | Mike Ricketts <rickettm@uk.ibm.com> | 2017-06-15 13:47:33 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-06-15 13:47:33 +0000 |
commit | 03b2ac659e43f39a4c6e646d0dbb5bd0a973cc38 (patch) | |
tree | 4d22335d7a35486280f063525540615f2add0a19 /spec/models | |
parent | 039c375372f76050c48d6e5c39bb8322c8bf7dc5 (diff) | |
download | gitlab-ce-03b2ac659e43f39a4c6e646d0dbb5bd0a973cc38.tar.gz |
#13336 - display multiple messages in both the UI and git output
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/broadcast_message_spec.rb | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/spec/models/broadcast_message_spec.rb b/spec/models/broadcast_message_spec.rb index 219db365a91..333f4139a96 100644 --- a/spec/models/broadcast_message_spec.rb +++ b/spec/models/broadcast_message_spec.rb @@ -21,22 +21,29 @@ describe BroadcastMessage, models: true do end describe '.current' do - it "returns last message if time match" do + it 'returns message if time match' do message = create(:broadcast_message) - expect(BroadcastMessage.current).to eq message + expect(BroadcastMessage.current).to include(message) end - it "returns nil if time not come" do + it 'returns multiple messages if time match' do + message1 = create(:broadcast_message) + message2 = create(:broadcast_message) + + expect(BroadcastMessage.current).to contain_exactly(message1, message2) + end + + it 'returns empty list if time not come' do create(:broadcast_message, :future) - expect(BroadcastMessage.current).to be_nil + expect(BroadcastMessage.current).to be_empty end - it "returns nil if time has passed" do + it 'returns empty list if time has passed' do create(:broadcast_message, :expired) - expect(BroadcastMessage.current).to be_nil + expect(BroadcastMessage.current).to be_empty end end |