diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-15 21:19:49 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-23 23:37:05 +0300 |
commit | 7c479d88a92233790bc0fb63146fe004f8b9b5d7 (patch) | |
tree | 3691c9e55229b145ea631bca724ba4da8c467d70 /spec/models/diff_note_spec.rb | |
parent | 7e09a9b7dcef125af2e775869754a3327935b12d (diff) |
Pass fallback_diff_refs to Diff::File instead of using view helpers
Diffstat (limited to 'spec/models/diff_note_spec.rb')
-rw-r--r-- | spec/models/diff_note_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb index ab4c51a87b0..96f075d4f7d 100644 --- a/spec/models/diff_note_spec.rb +++ b/spec/models/diff_note_spec.rb @@ -145,7 +145,7 @@ describe DiffNote, models: true do context "when the merge request's diff refs don't match that of the diff note" do before do - allow(subject.noteable).to receive(:diff_sha_refs).and_return(commit.diff_refs) + allow(subject.noteable).to receive(:diff_refs).and_return(commit.diff_refs) end it "returns false" do @@ -194,7 +194,7 @@ describe DiffNote, models: true do context "when the note is outdated" do before do - allow(merge_request).to receive(:diff_sha_refs).and_return(commit.diff_refs) + allow(merge_request).to receive(:diff_refs).and_return(commit.diff_refs) end it "uses the DiffPositionUpdateService" do |