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_versions_spec.rb | |
| parent | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request/user_sees_versions_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_sees_versions_spec.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/spec/features/merge_request/user_sees_versions_spec.rb b/spec/features/merge_request/user_sees_versions_spec.rb index cd62bab412a..5b43fe407eb 100644 --- a/spec/features/merge_request/user_sees_versions_spec.rb +++ b/spec/features/merge_request/user_sees_versions_spec.rb @@ -86,10 +86,8 @@ describe 'Merge request > User sees versions', :js do it 'shows comments that were last relevant at that version' do expect(page).to have_content '5 files' - position = Gitlab::Diff::Position.new( - old_path: ".gitmodules", - new_path: ".gitmodules", - old_line: nil, + position = build(:text_diff_position, :added, + file: ".gitmodules", new_line: 4, diff_refs: merge_request_diff1.diff_refs ) @@ -136,9 +134,8 @@ describe 'Merge request > User sees versions', :js do expect(additions_content).to eq '15' expect(deletions_content).to eq '6' - position = Gitlab::Diff::Position.new( - old_path: ".gitmodules", - new_path: ".gitmodules", + position = 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 |