Rebased and squashed commits

- all commits squashed to make danger review happy

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/javascripts/notes/components/noteable_discussion_spec.js b/spec/javascripts/notes/components/noteable_discussion_spec.js
index efa864e7d00..841233d54e4 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);
   });