summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-03-17 13:25:52 -0600
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-05 17:44:14 +0100
commit79889a6aa3dc878d196d0f2f445ab6b10ef10c74 (patch)
tree25367a69b4a529335e106d0d65c2d9a38e97f092 /spec/models/merge_request_spec.rb
parent80b2e18fb62b8da7410f90b3e5340b9e63e765a3 (diff)
downloadgitlab-ce-79889a6aa3dc878d196d0f2f445ab6b10ef10c74.tar.gz
Add specs
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 3d26049b54a..5d0862abb92 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1225,18 +1225,14 @@ describe MergeRequest, models: true do
end
context "discussion status" do
- let(:first_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) }
- let(:second_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) }
- let(:third_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) }
+ let(:first_discussion) { create(:discussion_note_on_merge_request).to_discussion }
+ let(:second_discussion) { create(:discussion_note_on_merge_request).to_discussion }
+ let(:third_discussion) { create(:discussion_note_on_merge_request).to_discussion }
before do
allow(subject).to receive(:resolvable_discussions).and_return([first_discussion, second_discussion, third_discussion])
end
- describe '#resolvable_discussions' do
- # TODO: Test
- end
-
describe "#discussions_resolvable?" do
context "when all discussions are unresolvable" do
before do