Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/frontend/search/topbar/components/app_spec.js b/spec/frontend/search/topbar/components/app_spec.js
index faf3629b444..ff37c733fdb 100644
--- a/spec/frontend/search/topbar/components/app_spec.js
+++ b/spec/frontend/search/topbar/components/app_spec.js
@@ -5,6 +5,7 @@ import { MOCK_QUERY } from 'jest/search/mock_data';
 import GlobalSearchTopbar from '~/search/topbar/components/app.vue';
 import GroupFilter from '~/search/topbar/components/group_filter.vue';
 import ProjectFilter from '~/search/topbar/components/project_filter.vue';
+import ScopeTabs from '~/search/topbar/components/scope_tabs.vue';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
@@ -42,6 +43,7 @@ describe('GlobalSearchTopbar', () => {
   const findGroupFilter = () => wrapper.find(GroupFilter);
   const findProjectFilter = () => wrapper.find(ProjectFilter);
   const findSearchButton = () => wrapper.find(GlButton);
+  const findScopeTabs = () => wrapper.find(ScopeTabs);
 
   describe('template', () => {
     beforeEach(() => {
@@ -52,6 +54,18 @@ describe('GlobalSearchTopbar', () => {
       expect(findTopbarForm().exists()).toBe(true);
     });
 
+    describe('Scope Tabs', () => {
+      it('renders when search param is set', () => {
+        createComponent({ query: { search: 'test' } });
+        expect(findScopeTabs().exists()).toBe(true);
+      });
+      it('does not render search param is blank', () => {
+        createComponent({ query: {} });
+
+        expect(findScopeTabs().exists()).toBe(false);
+      });
+    });
+
     describe('Search box', () => {
       it('renders always', () => {
         expect(findGlSearchBox().exists()).toBe(true);