Add latest changes from gitlab-org/gitlab@master

2 files changed, 20 insertions, 25 deletions

diff --git a/spec/frontend/groups/components/app_spec.js b/spec/frontend/groups/components/app_spec.js
index 56529726350..091ec17d58e 100644
--- a/spec/frontend/groups/components/app_spec.js
+++ b/spec/frontend/groups/components/app_spec.js
@@ -11,6 +11,7 @@ import eventHub from '~/groups/event_hub';
 import GroupsService from '~/groups/service/groups_service';
 import GroupsStore from '~/groups/store/groups_store';
 import EmptyState from '~/groups/components/empty_state.vue';
+import GroupsComponent from '~/groups/components/groups.vue';
 import axios from '~/lib/utils/axios_utils';
 import * as urlUtilities from '~/lib/utils/url_utility';
 import setWindowLocation from 'helpers/set_window_location_helper';
@@ -388,24 +389,27 @@ describe('AppComponent', () => {
       });
 
       describe.each`
-        action                      | groups        | fromSearch | renderEmptyState | expected
-        ${'subgroups_and_projects'} | ${[]}         | ${false}   | ${true}          | ${true}
-        ${''}                       | ${[]}         | ${false}   | ${true}          | ${false}
-        ${'subgroups_and_projects'} | ${mockGroups} | ${false}   | ${true}          | ${false}
-        ${'subgroups_and_projects'} | ${[]}         | ${true}    | ${true}          | ${false}
+        action                      | groups        | fromSearch | shouldRenderEmptyState | searchEmpty
+        ${'subgroups_and_projects'} | ${[]}         | ${false}   | ${true}                | ${false}
+        ${''}                       | ${[]}         | ${false}   | ${false}               | ${false}
+        ${'subgroups_and_projects'} | ${mockGroups} | ${false}   | ${false}               | ${false}
+        ${'subgroups_and_projects'} | ${[]}         | ${true}    | ${false}               | ${true}
       `(
-        'when `action` is $action, `groups` is $groups, `fromSearch` is $fromSearch, and `renderEmptyState` is $renderEmptyState',
-        ({ action, groups, fromSearch, renderEmptyState, expected }) => {
-          it(`${expected ? 'renders' : 'does not render'} empty state`, async () => {
+        'when `action` is $action, `groups` is $groups, and `fromSearch` is $fromSearch',
+        ({ action, groups, fromSearch, shouldRenderEmptyState, searchEmpty }) => {
+          it(`${shouldRenderEmptyState ? 'renders' : 'does not render'} empty state`, async () => {
             createShallowComponent({
-              propsData: { action, renderEmptyState },
+              propsData: { action, renderEmptyState: true },
             });
 
+            await waitForPromises();
+
             vm.updateGroups(groups, fromSearch);
 
             await nextTick();
 
-            expect(wrapper.findComponent(EmptyState).exists()).toBe(expected);
+            expect(wrapper.findComponent(EmptyState).exists()).toBe(shouldRenderEmptyState);
+            expect(wrapper.findComponent(GroupsComponent).props('searchEmpty')).toBe(searchEmpty);
           });
         },
       );
@@ -445,18 +449,6 @@ describe('AppComponent', () => {
         expect.any(Function),
       );
     });
-
-    it('should initialize `searchEmptyMessage` prop with correct string when `hideProjects` is `false`', async () => {
-      createShallowComponent();
-      await nextTick();
-      expect(vm.searchEmptyMessage).toBe('No groups or projects matched your search');
-    });
-
-    it('should initialize `searchEmptyMessage` prop with correct string when `hideProjects` is `true`', async () => {
-      createShallowComponent({ propsData: { hideProjects: true } });
-      await nextTick();
-      expect(vm.searchEmptyMessage).toBe('No groups matched your search');
-    });
   });
 
   describe('beforeDestroy', () => {
diff --git a/spec/frontend/groups/components/groups_spec.js b/spec/frontend/groups/components/groups_spec.js
index 866868eff36..0cbb6cc8309 100644
--- a/spec/frontend/groups/components/groups_spec.js
+++ b/spec/frontend/groups/components/groups_spec.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import { GlEmptyState } from '@gitlab/ui';
 
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import GroupFolderComponent from '~/groups/components/group_folder.vue';
@@ -15,7 +16,6 @@ describe('GroupsComponent', () => {
   const defaultPropsData = {
     groups: mockGroups,
     pageInfo: mockPageInfo,
-    searchEmptyMessage: 'No matching results',
     searchEmpty: false,
   };
 
@@ -67,13 +67,16 @@ describe('GroupsComponent', () => {
 
       expect(wrapper.findComponent(GroupFolderComponent).exists()).toBe(true);
       expect(findPaginationLinks().exists()).toBe(true);
-      expect(wrapper.findByText(defaultPropsData.searchEmptyMessage).exists()).toBe(false);
+      expect(wrapper.findComponent(GlEmptyState).exists()).toBe(false);
     });
 
     it('should render empty search message when `searchEmpty` is `true`', () => {
       createComponent({ propsData: { searchEmpty: true } });
 
-      expect(wrapper.findByText(defaultPropsData.searchEmptyMessage).exists()).toBe(true);
+      expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
+        title: GroupsComponent.i18n.emptyStateTitle,
+        description: GroupsComponent.i18n.emptyStateDescription,
+      });
     });
   });
 });