1 files changed, 18 insertions, 10 deletions
diff --git a/spec/frontend/diffs/components/diff_file_spec.js b/spec/frontend/diffs/components/diff_file_spec.js
index 71e0ffd176f..c715d779986 100644
--- a/spec/frontend/diffs/components/diff_file_spec.js
+++ b/spec/frontend/diffs/components/diff_file_spec.js
@@ -1,6 +1,9 @@
 import Vuex from 'vuex';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
+import MockAdapter from 'axios-mock-adapter';
 
+import axios from '~/lib/utils/axios_utils';
+import httpStatus from '~/lib/utils/http_status';
 import createDiffsStore from '~/diffs/store/modules';
 import createNotesStore from '~/notes/stores/modules';
 import diffFileMockDataReadable from '../mock_data/diff_file';
@@ -96,13 +99,13 @@ function createComponent({ file, first = false, last = false }) {
   };
 }
 
-const findDiffHeader = wrapper => wrapper.find(DiffFileHeaderComponent);
-const findDiffContentArea = wrapper => wrapper.find('[data-testid="content-area"]');
-const findLoader = wrapper => wrapper.find('[data-testid="loader-icon"]');
-const findToggleButton = wrapper => wrapper.find('[data-testid="expand-button"]');
+const findDiffHeader = (wrapper) => wrapper.find(DiffFileHeaderComponent);
+const findDiffContentArea = (wrapper) => wrapper.find('[data-testid="content-area"]');
+const findLoader = (wrapper) => wrapper.find('[data-testid="loader-icon"]');
+const findToggleButton = (wrapper) => wrapper.find('[data-testid="expand-button"]');
 
-const toggleFile = wrapper => findDiffHeader(wrapper).vm.$emit('toggleFile');
-const isDisplayNone = element => element.style.display === 'none';
+const toggleFile = (wrapper) => findDiffHeader(wrapper).vm.$emit('toggleFile');
+const isDisplayNone = (element) => element.style.display === 'none';
 const getReadableFile = () => JSON.parse(JSON.stringify(diffFileMockDataReadable));
 const getUnreadableFile = () => JSON.parse(JSON.stringify(diffFileMockDataUnreadable));
 
@@ -118,14 +121,17 @@ const changeViewerType = (store, newType, index = 0) =>
 describe('DiffFile', () => {
   let wrapper;
   let store;
+  let axiosMock;
 
   beforeEach(() => {
+    axiosMock = new MockAdapter(axios);
     ({ wrapper, store } = createComponent({ file: getReadableFile() }));
   });
 
   afterEach(() => {
     wrapper.destroy();
     wrapper = null;
+    axiosMock.restore();
   });
 
   describe('bus events', () => {
@@ -157,7 +163,7 @@ describe('DiffFile', () => {
           await wrapper.vm.$nextTick();
 
           expect(eventHub.$emit).toHaveBeenCalledTimes(events.length);
-          events.forEach(event => {
+          events.forEach((event) => {
             expect(eventHub.$emit).toHaveBeenCalledWith(event);
           });
         },
@@ -174,7 +180,7 @@ describe('DiffFile', () => {
         }));
 
         jest.spyOn(wrapper.vm, 'loadCollapsedDiff').mockResolvedValue(getReadableFile());
-        jest.spyOn(window, 'requestIdleCallback').mockImplementation(fn => fn());
+        jest.spyOn(window, 'requestIdleCallback').mockImplementation((fn) => fn());
 
         makeFileAutomaticallyCollapsed(store);
 
@@ -247,7 +253,7 @@ describe('DiffFile', () => {
       it('should not have any content at all', async () => {
         await wrapper.vm.$nextTick();
 
-        Array.from(findDiffContentArea(wrapper).element.children).forEach(child => {
+        Array.from(findDiffContentArea(wrapper).element.children).forEach((child) => {
           expect(isDisplayNone(child)).toBe(true);
         });
       });
@@ -353,8 +359,10 @@ describe('DiffFile', () => {
 
     describe('loading', () => {
       it('should have loading icon while loading a collapsed diffs', async () => {
+        const { load_collapsed_diff_url } = store.state.diffs.diffFiles[0];
+        axiosMock.onGet(load_collapsed_diff_url).reply(httpStatus.OK, getReadableFile());
         makeFileAutomaticallyCollapsed(store);
-        wrapper.vm.isLoadingCollapsedDiff = true;
+        wrapper.vm.requestDiff();
 
         await wrapper.vm.$nextTick();