Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 38 deletions

diff --git a/spec/frontend/ide/components/ide_spec.js b/spec/frontend/ide/components/ide_spec.js
index ff3852b6775..315298eaf26 100644
--- a/spec/frontend/ide/components/ide_spec.js
+++ b/spec/frontend/ide/components/ide_spec.js
@@ -1,15 +1,8 @@
 import Vuex from 'vuex';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
-import { GlButton, GlLoadingIcon } from '@gitlab/ui';
+import waitForPromises from 'helpers/wait_for_promises';
 import { createStore } from '~/ide/stores';
 import ErrorMessage from '~/ide/components/error_message.vue';
-import FindFile from '~/vue_shared/components/file_finder/index.vue';
-import CommitEditorHeader from '~/ide/components/commit_sidebar/editor_header.vue';
-import RepoTabs from '~/ide/components/repo_tabs.vue';
-import IdeStatusBar from '~/ide/components/ide_status_bar.vue';
-import RightPane from '~/ide/components/panes/right.vue';
-import NewModal from '~/ide/components/new_dropdown/modal.vue';
-
 import ide from '~/ide/components/ide.vue';
 import { file } from '../helpers';
 import { projectData } from '../mock_data';
@@ -39,17 +32,6 @@ describe('WebIDE', () => {
     return shallowMount(ide, {
       store,
       localVue,
-      stubs: {
-        ErrorMessage,
-        GlButton,
-        GlLoadingIcon,
-        CommitEditorHeader,
-        RepoTabs,
-        IdeStatusBar,
-        FindFile,
-        RightPane,
-        NewModal,
-      },
     });
   }
 
@@ -74,27 +56,24 @@ describe('WebIDE', () => {
 
   describe('ide component, non-empty repo', () => {
     describe('error message', () => {
-      it('does not show error message when it is not set', () => {
-        wrapper = createComponent({
-          state: {
-            errorMessage: null,
-          },
-        });
-
-        expect(wrapper.find(ErrorMessage).exists()).toBe(false);
-      });
-
-      it('shows error message when set', () => {
-        wrapper = createComponent({
-          state: {
-            errorMessage: {
-              text: 'error',
+      it.each`
+        errorMessage         | exists
+        ${null}              | ${false}
+        ${{ text: 'error' }} | ${true}
+      `(
+        'should error message exists=$exists when errorMessage=$errorMessage',
+        async ({ errorMessage, exists }) => {
+          wrapper = createComponent({
+            state: {
+              errorMessage,
             },
-          },
-        });
+          });
 
-        expect(wrapper.find(ErrorMessage).exists()).toBe(true);
-      });
+          await waitForPromises();
+
+          expect(wrapper.find(ErrorMessage).exists()).toBe(exists);
+        },
+      );
     });
 
     describe('onBeforeUnload', () => {