Commit 6f81fc44 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'sh-fix-nil-broadcast-message' into 'master'

Handle case when BroadcastMessage.current is nil

Closes #35094

See merge request !12860
parents dbcc0e03 e6cd2353
- BroadcastMessage.current.each do |message| - BroadcastMessage.current&.each do |message|
= broadcast_message(message) = broadcast_message(message)
...@@ -101,7 +101,7 @@ module API ...@@ -101,7 +101,7 @@ module API
end end
get "/broadcast_message" do get "/broadcast_message" do
if message = BroadcastMessage.current.last if message = BroadcastMessage.current&.last
present message, with: Entities::BroadcastMessage present message, with: Entities::BroadcastMessage
else else
{} {}
......
...@@ -35,6 +35,17 @@ describe API::Internal do ...@@ -35,6 +35,17 @@ describe API::Internal do
expect(json_response).to be_empty expect(json_response).to be_empty
end end
end end
context 'nil broadcast message' do
it 'returns nothing' do
allow(BroadcastMessage).to receive(:current).and_return(nil)
get api('/internal/broadcast_message'), secret_token: secret_token
expect(response).to have_http_status(200)
expect(json_response).to be_empty
end
end
end end
describe 'GET /internal/broadcast_messages' do describe 'GET /internal/broadcast_messages' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment