Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/views/layouts/_search.html.haml_spec.rb b/spec/views/layouts/_search.html.haml_spec.rb
index f0c7cb57b25..ceb82e3640e 100644
--- a/spec/views/layouts/_search.html.haml_spec.rb
+++ b/spec/views/layouts/_search.html.haml_spec.rb
@@ -25,6 +25,15 @@ RSpec.describe 'layouts/_search' do
   end
 
   shared_examples 'search context scope is set' do
+    context 'when rendering' do
+      it 'sets the placeholder' do
+        render
+
+        expect(rendered).to include('placeholder="Search GitLab"')
+        expect(rendered).to include('aria-label="Search GitLab"')
+      end
+    end
+
     context 'when on issues' do
       it 'sets scope to issues' do
         render