Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/features/broadcast_messages_spec.rb b/spec/features/broadcast_messages_spec.rb
index d7c84b8085b..809e53ed7f7 100644
--- a/spec/features/broadcast_messages_spec.rb
+++ b/spec/features/broadcast_messages_spec.rb
@@ -57,4 +57,15 @@ describe 'Broadcast Messages' do
 
     it_behaves_like 'a dismissable Broadcast Messages'
   end
+
+  it 'renders broadcast message with placeholders' do
+    create(:broadcast_message, broadcast_type: 'notification', message: 'Hi {{name}}')
+
+    user = create(:user)
+    sign_in(user)
+
+    visit root_path
+
+    expect(page).to have_content "Hi #{user.name}"
+  end
 end