summaryrefslogtreecommitdiff
path: root/spec/models/discussion_spec.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-04-04 17:27:23 -0500
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-05 17:44:14 +0100
commitc319f2114177f011cd0c6c23b04f7c19971268bf (patch)
treeb91a2ace5426bea9a7c6a60eabbd44da394fa80c /spec/models/discussion_spec.rb
parentafa53810deab37c95da245510a7cf85e8846a162 (diff)
downloadgitlab-ce-c319f2114177f011cd0c6c23b04f7c19971268bf.tar.gz
Address review comments
Diffstat (limited to 'spec/models/discussion_spec.rb')
-rw-r--r--spec/models/discussion_spec.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/models/discussion_spec.rb b/spec/models/discussion_spec.rb
index 718b208e8f8..0221e23ced8 100644
--- a/spec/models/discussion_spec.rb
+++ b/spec/models/discussion_spec.rb
@@ -3,15 +3,15 @@ require 'spec_helper'
describe Discussion, model: true do
subject { described_class.new([first_note, second_note, third_note]) }
- let(:first_note) { create(:discussion_note_on_merge_request) }
+ let(:first_note) { create(:diff_note_on_merge_request) }
let(:merge_request) { first_note.noteable }
- let(:second_note) { create(:discussion_note_on_merge_request, in_reply_to: first_note) }
- let(:third_note) { create(:discussion_note_on_merge_request) }
+ let(:second_note) { create(:diff_note_on_merge_request, in_reply_to: first_note) }
+ let(:third_note) { create(:diff_note_on_merge_request) }
describe '.build' do
it 'returns a discussion of the right type' do
discussion = described_class.build([first_note, second_note], merge_request)
- expect(discussion).to be_a(SimpleDiscussion)
+ expect(discussion).to be_a(DiffDiscussion)
expect(discussion.notes.count).to be(2)
expect(discussion.first_note).to be(first_note)
expect(discussion.noteable).to be(merge_request)
@@ -22,8 +22,8 @@ describe Discussion, model: true do
it 'returns an array of discussions of the right type' do
discussions = described_class.build_collection([first_note, second_note, third_note], merge_request)
expect(discussions).to eq([
- SimpleDiscussion.new([first_note, second_note], merge_request),
- SimpleDiscussion.new([third_note], merge_request)
+ DiffDiscussion.new([first_note, second_note], merge_request),
+ DiffDiscussion.new([third_note], merge_request)
])
end
end