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/frontend/fixtures/merge_requests_diffs.rb | |
parent | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/fixtures/merge_requests_diffs.rb')
-rw-r--r-- | spec/frontend/fixtures/merge_requests_diffs.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/frontend/fixtures/merge_requests_diffs.rb b/spec/frontend/fixtures/merge_requests_diffs.rb index 9493cba03bb..7997ee79a01 100644 --- a/spec/frontend/fixtures/merge_requests_diffs.rb +++ b/spec/frontend/fixtures/merge_requests_diffs.rb @@ -12,10 +12,8 @@ describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type let(:path) { "files/ruby/popen.rb" } let(:selected_commit) { merge_request.all_commits[0] } 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: 14, diff_refs: merge_request.diff_refs ) |