diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:00 +0000 |
| commit | eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (patch) | |
| tree | d572a6d931152ae0dd10427237f5811893438552 /spec/helpers | |
| parent | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff) | |
| download | gitlab-ce-eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/notes_helper_spec.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/spec/helpers/notes_helper_spec.rb b/spec/helpers/notes_helper_spec.rb index 2da7717ebfc..1dc7f4e98ab 100644 --- a/spec/helpers/notes_helper_spec.rb +++ b/spec/helpers/notes_helper_spec.rb @@ -62,10 +62,8 @@ describe NotesHelper do context 'when the discussion is on an older merge request version' do let(:position) do - Gitlab::Diff::Position.new( - old_path: ".gitmodules", - new_path: ".gitmodules", - old_line: nil, + build(:text_diff_position, :added, + file: ".gitmodules", new_line: 4, diff_refs: merge_request_diff1.diff_refs ) @@ -86,9 +84,8 @@ describe NotesHelper do context 'when the discussion is on a comparison between merge request versions' do let(:position) do - Gitlab::Diff::Position.new( - old_path: ".gitmodules", - new_path: ".gitmodules", + build(:text_diff_position, + file: ".gitmodules", old_line: 4, new_line: 4, diff_refs: merge_request_diff3.compare_with(merge_request_diff1.head_commit_sha).diff_refs |