diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
commit | 77237c5a6b9044f58beabc54d3589e5fa09cbfba (patch) | |
tree | f43188047fe8955f6cf78e05ae9c2e8f6a019e0b /spec/helpers | |
parent | 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/broadcast_messages_helper_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/helpers/broadcast_messages_helper_spec.rb b/spec/helpers/broadcast_messages_helper_spec.rb index 7e181e429d7..69ff5f16ec1 100644 --- a/spec/helpers/broadcast_messages_helper_spec.rb +++ b/spec/helpers/broadcast_messages_helper_spec.rb @@ -14,7 +14,7 @@ describe BroadcastMessagesHelper do context 'when last broadcast message is hidden' do before do - helper.request.cookies["hide_broadcast_notification_message_#{broadcast_message_2.id}"] = 'true' + helper.request.cookies["hide_broadcast_message_#{broadcast_message_2.id}"] = 'true' end it { is_expected.to eq broadcast_message_1 } @@ -29,6 +29,10 @@ describe BroadcastMessagesHelper do describe 'broadcast_message' do let(:current_broadcast_message) { BroadcastMessage.new(message: 'Current Message') } + before do + allow(helper).to receive(:current_user).and_return(create(:user)) + end + it 'returns nil when no current message' do expect(helper.broadcast_message(nil)).to be_nil end |