Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 8 deletions

diff --git a/spec/frontend/ide/components/ide_spec.js b/spec/frontend/ide/components/ide_spec.js
index 1f9d62f5558..ff3852b6775 100644
--- a/spec/frontend/ide/components/ide_spec.js
+++ b/spec/frontend/ide/components/ide_spec.js
@@ -1,7 +1,15 @@
 import Vuex from 'vuex';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
+import { GlButton, GlLoadingIcon } from '@gitlab/ui';
 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';
@@ -14,7 +22,7 @@ describe('WebIDE', () => {
 
   let wrapper;
 
-  function createComponent({ projData = emptyProjData, state = {}, mockStubs = {} } = {}) {
+  function createComponent({ projData = emptyProjData, state = {} } = {}) {
     const store = createStore();
 
     store.state.currentProjectId = 'abcproject';
@@ -31,7 +39,17 @@ describe('WebIDE', () => {
     return shallowMount(ide, {
       store,
       localVue,
-      stubs: mockStubs,
+      stubs: {
+        ErrorMessage,
+        GlButton,
+        GlLoadingIcon,
+        CommitEditorHeader,
+        RepoTabs,
+        IdeStatusBar,
+        FindFile,
+        RightPane,
+        NewModal,
+      },
     });
   }
 
@@ -61,9 +79,6 @@ describe('WebIDE', () => {
           state: {
             errorMessage: null,
           },
-          mockStubs: {
-            ErrorMessage,
-          },
         });
 
         expect(wrapper.find(ErrorMessage).exists()).toBe(false);
@@ -76,9 +91,6 @@ describe('WebIDE', () => {
               text: 'error',
             },
           },
-          mockStubs: {
-            ErrorMessage,
-          },
         });
 
         expect(wrapper.find(ErrorMessage).exists()).toBe(true);