diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 21:09:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 21:09:00 +0300 |
commit | eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (patch) | |
tree | d572a6d931152ae0dd10427237f5811893438552 /spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb | |
parent | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb index 3e77b9e75d6..c482d783bab 100644 --- a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb +++ b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb @@ -10,10 +10,8 @@ describe 'Merge request > User sees avatars on diff notes', :js do let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: 'Bug NS-04') } let(:path) { 'files/ruby/popen.rb' } let(:position) do - Gitlab::Diff::Position.new( - old_path: path, - new_path: path, - old_line: nil, + build(:text_diff_position, :added, + file: path, new_line: 9, diff_refs: merge_request.diff_refs ) |