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

4 files changed, 11 insertions, 9 deletions

diff --git a/spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap b/spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap
index 084a7e5d712..4ecf82a4714 100644
--- a/spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap
+++ b/spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap
@@ -6,7 +6,7 @@ exports[`Design note component should match the snapshot 1`] = `
   id="note_123"
 >
   <user-avatar-link-stub
-    imgalt=""
+    imgalt="foo-bar"
     imgcssclasses=""
     imgsize="40"
     imgsrc=""
@@ -22,7 +22,8 @@ exports[`Design note component should match the snapshot 1`] = `
     <div>
       <gl-link-stub
         class="js-user-link"
-        data-user-id="author-id"
+        data-user-id="1"
+        data-username="foo-bar"
       >
         <span
           class="note-header-author-name gl-font-weight-bold"
@@ -35,7 +36,7 @@ exports[`Design note component should match the snapshot 1`] = `
         <span
           class="note-headline-light"
         >
-          @
+          @foo-bar
         </span>
       </gl-link-stub>
        
diff --git a/spec/frontend/design_management/components/design_notes/design_note_spec.js b/spec/frontend/design_management/components/design_notes/design_note_spec.js
index 1cd556eabb4..3f5f5bcdfa7 100644
--- a/spec/frontend/design_management/components/design_notes/design_note_spec.js
+++ b/spec/frontend/design_management/components/design_notes/design_note_spec.js
@@ -9,7 +9,8 @@ const scrollIntoViewMock = jest.fn();
 const note = {
   id: 'gid://gitlab/DiffNote/123',
   author: {
-    id: 'author-id',
+    id: 'gid://gitlab/User/1',
+    username: 'foo-bar',
   },
   body: 'test',
   userPermissions: {
diff --git a/spec/frontend/design_management/components/design_todo_button_spec.js b/spec/frontend/design_management/components/design_todo_button_spec.js
index 20686d0ae6c..757bf50c527 100644
--- a/spec/frontend/design_management/components/design_todo_button_spec.js
+++ b/spec/frontend/design_management/components/design_todo_button_spec.js
@@ -2,7 +2,7 @@ import { shallowMount, mount } from '@vue/test-utils';
 import DesignTodoButton from '~/design_management/components/design_todo_button.vue';
 import createDesignTodoMutation from '~/design_management/graphql/mutations/create_design_todo.mutation.graphql';
 import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql';
-import TodoButton from '~/vue_shared/components/todo_button.vue';
+import TodoButton from '~/vue_shared/components/sidebar/todo_toggle/todo_button.vue';
 import mockDesign from '../mock_data/design';
 
 const mockDesignWithPendingTodos = {
diff --git a/spec/frontend/design_management/pages/design/index_spec.js b/spec/frontend/design_management/pages/design/index_spec.js
index 11c88c3d0f5..1332e872246 100644
--- a/spec/frontend/design_management/pages/design/index_spec.js
+++ b/spec/frontend/design_management/pages/design/index_spec.js
@@ -20,7 +20,7 @@ import {
 import {
   DESIGN_TRACKING_PAGE_NAME,
   DESIGN_SNOWPLOW_EVENT_TYPES,
-  DESIGN_USAGE_PING_EVENT_TYPES,
+  DESIGN_SERVICE_PING_EVENT_TYPES,
 } from '~/design_management/utils/tracking';
 import createFlash from '~/flash';
 import mockAllVersions from '../../mock_data/all_versions';
@@ -391,7 +391,7 @@ describe('Design management design index page', () => {
       });
 
       describe('with usage_data_design_action enabled', () => {
-        it('tracks design view usage ping', () => {
+        it('tracks design view service ping', () => {
           createComponent(
             { loading: true },
             {
@@ -402,13 +402,13 @@ describe('Design management design index page', () => {
           );
           expect(Api.trackRedisHllUserEvent).toHaveBeenCalledTimes(1);
           expect(Api.trackRedisHllUserEvent).toHaveBeenCalledWith(
-            DESIGN_USAGE_PING_EVENT_TYPES.DESIGN_ACTION,
+            DESIGN_SERVICE_PING_EVENT_TYPES.DESIGN_ACTION,
           );
         });
       });
 
       describe('with usage_data_design_action disabled', () => {
-        it("doesn't track design view usage ping", () => {
+        it("doesn't track design view service ping", () => {
           createComponent({ loading: true });
           expect(Api.trackRedisHllUserEvent).toHaveBeenCalledTimes(0);
         });