Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/frontend/ide/stores/modules/clientside/actions_spec.js b/spec/frontend/ide/stores/modules/clientside/actions_spec.js
index c167d056039..88d7a630a90 100644
--- a/spec/frontend/ide/stores/modules/clientside/actions_spec.js
+++ b/spec/frontend/ide/stores/modules/clientside/actions_spec.js
@@ -5,7 +5,7 @@ import * as actions from '~/ide/stores/modules/clientside/actions';
 import axios from '~/lib/utils/axios_utils';
 
 const TEST_PROJECT_URL = `${TEST_HOST}/lorem/ipsum`;
-const TEST_USAGE_URL = `${TEST_PROJECT_URL}/usage_ping/web_ide_clientside_preview`;
+const TEST_USAGE_URL = `${TEST_PROJECT_URL}/service_ping/web_ide_clientside_preview`;
 
 describe('IDE store module clientside actions', () => {
   let rootGetters;
diff --git a/spec/frontend/ide/stores/utils_spec.js b/spec/frontend/ide/stores/utils_spec.js
index 8f7b8c5e311..79b6b66319e 100644
--- a/spec/frontend/ide/stores/utils_spec.js
+++ b/spec/frontend/ide/stores/utils_spec.js
@@ -604,7 +604,7 @@ describe('Multi-file store utils', () => {
     let entries;
 
     beforeEach(() => {
-      const img = { content: '/base64/encoded/image+' };
+      const img = { content: 'png-gibberish', rawPath: 'blob:1234' };
       mdFile = { path: 'path/to/some/directory/myfile.md' };
       entries = {
         // invalid (or lack of) extensions are also supported as long as there's
@@ -637,14 +637,14 @@ describe('Multi-file store utils', () => {
       ${'* ![img](img.png "title here")'}     | ${'png'}  | ${'img'}         | ${'title here'}
     `(
       'correctly transforms markdown with uncommitted images: $markdownBefore',
-      ({ markdownBefore, ext, imgAlt, imgTitle }) => {
+      ({ markdownBefore, imgAlt, imgTitle }) => {
         mdFile.content = markdownBefore;
 
         expect(utils.extractMarkdownImagesFromEntries(mdFile, entries)).toEqual({
           content: '* {{gl_md_img_1}}',
           images: {
             '{{gl_md_img_1}}': {
-              src: `data:image/${ext};base64,/base64/encoded/image+`,
+              src: 'blob:1234',
               alt: imgAlt,
               title: imgTitle,
             },