Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953

2 files changed, 14 insertions, 8 deletions

diff --git a/spec/javascripts/notes/components/noteable_discussion_spec.js b/spec/javascripts/notes/components/noteable_discussion_spec.js
index c98366dd54f..74805ca8c00 100644
--- a/spec/javascripts/notes/components/noteable_discussion_spec.js
+++ b/spec/javascripts/notes/components/noteable_discussion_spec.js
@@ -36,6 +36,12 @@ describe('noteable_discussion component', () => {
   });
 
   it('should render user avatar', () => {
+    const discussion = { ...discussionMock };
+    discussion.diff_file = mockDiffFile;
+    discussion.diff_discussion = true;
+
+    wrapper.setProps({ discussion, renderDiffFile: true });
+
     expect(wrapper.find('.user-avatar-link').exists()).toBe(true);
   });
 
diff --git a/spec/javascripts/notes/stores/actions_spec.js b/spec/javascripts/notes/stores/actions_spec.js
index 7a9f32ddcff..65f72a135aa 100644
--- a/spec/javascripts/notes/stores/actions_spec.js
+++ b/spec/javascripts/notes/stores/actions_spec.js
@@ -373,7 +373,7 @@ describe('Actions Notes Store', () => {
             type: 'updateMergeRequestWidget',
           },
           {
-            type: 'updateResolvableDiscussonsCounts',
+            type: 'updateResolvableDiscussionsCounts',
           },
         ],
         done,
@@ -400,7 +400,7 @@ describe('Actions Notes Store', () => {
             type: 'updateMergeRequestWidget',
           },
           {
-            type: 'updateResolvableDiscussonsCounts',
+            type: 'updateResolvableDiscussionsCounts',
           },
           {
             type: 'diffs/removeDiscussionsFromDiff',
@@ -452,7 +452,7 @@ describe('Actions Notes Store', () => {
               type: 'startTaskList',
             },
             {
-              type: 'updateResolvableDiscussonsCounts',
+              type: 'updateResolvableDiscussionsCounts',
             },
           ],
           done,
@@ -527,7 +527,7 @@ describe('Actions Notes Store', () => {
           ],
           [
             {
-              type: 'updateResolvableDiscussonsCounts',
+              type: 'updateResolvableDiscussionsCounts',
             },
             {
               type: 'updateMergeRequestWidget',
@@ -552,7 +552,7 @@ describe('Actions Notes Store', () => {
           ],
           [
             {
-              type: 'updateResolvableDiscussonsCounts',
+              type: 'updateResolvableDiscussionsCounts',
             },
             {
               type: 'updateMergeRequestWidget',
@@ -587,10 +587,10 @@ describe('Actions Notes Store', () => {
     });
   });
 
-  describe('updateResolvableDiscussonsCounts', () => {
+  describe('updateResolvableDiscussionsCounts', () => {
     it('commits UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS', done => {
       testAction(
-        actions.updateResolvableDiscussonsCounts,
+        actions.updateResolvableDiscussionsCounts,
         null,
         {},
         [{ type: 'UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS' }],
@@ -712,7 +712,7 @@ describe('Actions Notes Store', () => {
         [
           { type: 'updateMergeRequestWidget' },
           { type: 'startTaskList' },
-          { type: 'updateResolvableDiscussonsCounts' },
+          { type: 'updateResolvableDiscussionsCounts' },
         ],
         done,
       );