Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb
index 7e851a1af01..55f743ac683 100644
--- a/spec/helpers/page_layout_helper_spec.rb
+++ b/spec/helpers/page_layout_helper_spec.rb
@@ -117,4 +117,19 @@ describe PageLayoutHelper do
       expect(tags).to include(%q{content="foo" http-equiv="refresh"})
     end
   end
+
+  describe '#search_context' do
+    subject(:search_context) { helper.search_context }
+
+    describe 'a bare controller' do
+      it 'returns an empty context' do
+        expect(search_context).to have_attributes(project: nil,
+                                                  group: nil,
+                                                  snippets: [],
+                                                  project_metadata: {},
+                                                  group_metadata: {},
+                                                  search_url: '/search')
+      end
+    end
+  end
 end