Add latest changes from gitlab-org/gitlab@master

4 files changed, 7 insertions, 7 deletions

diff --git a/spec/frontend/notes/components/__snapshots__/notes_app_spec.js.snap b/spec/frontend/notes/components/__snapshots__/notes_app_spec.js.snap
index 5f4b3e04a79..bc29903d4bf 100644
--- a/spec/frontend/notes/components/__snapshots__/notes_app_spec.js.snap
+++ b/spec/frontend/notes/components/__snapshots__/notes_app_spec.js.snap
@@ -3,15 +3,15 @@
 exports[`note_app when sort direction is asc shows skeleton notes after the loaded discussions 1`] = `
 "<ul id=\\"notes-list\\" class=\\"notes main-notes-list timeline\\">
   <noteable-discussion-stub discussion=\\"[object Object]\\" renderdifffile=\\"true\\" helppagepath=\\"\\" isoverviewtab=\\"true\\"></noteable-discussion-stub>
-  <skeleton-loading-container-stub></skeleton-loading-container-stub>
-  <discussion-filter-note-stub style=\\"display: none;\\"></discussion-filter-note-stub>
+  <skeleton-loading-container-stub class=\\"note-skeleton\\"></skeleton-loading-container-stub>
+  <!---->
 </ul>"
 `;
 
 exports[`note_app when sort direction is desc shows skeleton notes before the loaded discussions 1`] = `
 "<ul id=\\"notes-list\\" class=\\"notes main-notes-list timeline\\">
-  <skeleton-loading-container-stub></skeleton-loading-container-stub>
+  <skeleton-loading-container-stub class=\\"note-skeleton\\"></skeleton-loading-container-stub>
   <noteable-discussion-stub discussion=\\"[object Object]\\" renderdifffile=\\"true\\" helppagepath=\\"\\" isoverviewtab=\\"true\\"></noteable-discussion-stub>
-  <discussion-filter-note-stub style=\\"display: none;\\"></discussion-filter-note-stub>
+  <!---->
 </ul>"
 `;
diff --git a/spec/frontend/notes/components/diff_discussion_header_spec.js b/spec/frontend/notes/components/diff_discussion_header_spec.js
index 5800f68b114..bb44563b87a 100644
--- a/spec/frontend/notes/components/diff_discussion_header_spec.js
+++ b/spec/frontend/notes/components/diff_discussion_header_spec.js
@@ -42,7 +42,7 @@ describe('diff_discussion_header component', () => {
       expect(props).toMatchObject({
         src: firstNoteAuthor.avatar_url,
         alt: firstNoteAuthor.name,
-        size: { default: 24, md: 32 },
+        size: 32,
       });
     });
   });
diff --git a/spec/frontend/notes/components/note_header_spec.js b/spec/frontend/notes/components/note_header_spec.js
index 76177229cff..1eb5452956f 100644
--- a/spec/frontend/notes/components/note_header_spec.js
+++ b/spec/frontend/notes/components/note_header_spec.js
@@ -149,7 +149,7 @@ describe('NoteHeader component', () => {
   it('renders busy status if author availability is set', () => {
     createComponent({ author: { ...author, availability: AVAILABILITY_STATUS.BUSY } });
 
-    expect(wrapper.find('.js-user-link').text()).toContain('(Busy)');
+    expect(wrapper.find('.note-header-info').text()).toContain('(Busy)');
   });
 
   it('renders author status', () => {
diff --git a/spec/frontend/notes/components/noteable_note_spec.js b/spec/frontend/notes/components/noteable_note_spec.js
index b044d40cbe4..3d7195752d3 100644
--- a/spec/frontend/notes/components/noteable_note_spec.js
+++ b/spec/frontend/notes/components/noteable_note_spec.js
@@ -214,7 +214,7 @@ describe('issue_note', () => {
       expect(avatarProps.src).toBe(author.avatar_url);
       expect(avatarProps.entityName).toBe(author.username);
       expect(avatarProps.alt).toBe(author.name);
-      expect(avatarProps.size).toEqual({ default: 24, md: 32 });
+      expect(avatarProps.size).toEqual(32);
     });
 
     it('should render note header content', () => {