Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 8 insertions, 14 deletions

diff --git a/spec/frontend/blob/sketch/index_spec.js b/spec/frontend/blob/sketch/index_spec.js
index e8d1f724c4b..4b6cb79791c 100644
--- a/spec/frontend/blob/sketch/index_spec.js
+++ b/spec/frontend/blob/sketch/index_spec.js
@@ -2,18 +2,6 @@ import SketchLoader from '~/blob/sketch';
 import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import waitForPromises from 'helpers/wait_for_promises';
 
-jest.mock('jszip', () => {
-  return {
-    loadAsync: jest.fn().mockResolvedValue({
-      files: {
-        'previews/preview.png': {
-          async: jest.fn().mockResolvedValue('foo'),
-        },
-      },
-    }),
-  };
-});
-
 describe('Sketch viewer', () => {
   beforeEach(() => {
     loadHTMLFixture('static/sketch_viewer.html');
@@ -25,7 +13,7 @@ describe('Sketch viewer', () => {
 
   describe('with error message', () => {
     beforeEach(() => {
-      jest.spyOn(SketchLoader.prototype, 'getZipFile').mockImplementation(
+      jest.spyOn(SketchLoader.prototype, 'getZipContents').mockImplementation(
         () =>
           new Promise((resolve, reject) => {
             reject();
@@ -50,7 +38,13 @@ describe('Sketch viewer', () => {
 
   describe('success', () => {
     beforeEach(() => {
-      jest.spyOn(SketchLoader.prototype, 'getZipFile').mockResolvedValue();
+      jest.spyOn(SketchLoader.prototype, 'getZipContents').mockResolvedValue({
+        files: {
+          'previews/preview.png': {
+            async: jest.fn().mockResolvedValue('foo'),
+          },
+        },
+      });
       // eslint-disable-next-line no-new
       new SketchLoader(document.getElementById('js-sketch-viewer'));