diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-14 01:13:12 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 19:44:14 +0300 |
| commit | 9c30b0e918ca035d8555de5e3393247f6d00ed16 (patch) | |
| tree | 7aeea9695748036cf465952711184f2469427fab /spec/models/note_spec.rb | |
| parent | 336016fa858dfa48b9f9e9b5b2d9c3a9000fffe5 (diff) | |
Fix some specs
Diffstat (limited to 'spec/models/note_spec.rb')
| -rw-r--r-- | spec/models/note_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index c5e4a639f06..7a85c5f22ff 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -414,7 +414,7 @@ describe Note, models: true do describe '#to_discussion' do subject { create(:discussion_note_on_merge_request) } - let!(:note2) { create(:discussion_note_on_merge_request, project: subject.project, noteable: subject.noteable, in_reply_to_discussion_id: subject.discussion_id) } + let!(:note2) { create(:discussion_note_on_merge_request, project: subject.project, noteable: subject.noteable, in_reply_to: subject) } it "returns a discussion with just this note" do discussion = subject.to_discussion @@ -429,7 +429,7 @@ describe Note, models: true do let!(:note2) { create(:diff_note_on_merge_request, project: note1.project, noteable: note1.noteable) } context 'when the note is part of a discussion' do - subject { create(:discussion_note_on_merge_request, project: note1.project, noteable: note1.noteable, in_reply_to_discussion_id: note1.discussion_id) } + subject { create(:discussion_note_on_merge_request, project: note1.project, noteable: note1.noteable, in_reply_to: note1) } it "returns the discussion this note is in" do discussion = subject.discussion |