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/merge_request_spec.rb | |
parent | 336016fa858dfa48b9f9e9b5b2d9c3a9000fffe5 (diff) |
Fix some specs
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r-- | spec/models/merge_request_spec.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index faa89ff0507..3d26049b54a 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1234,15 +1234,7 @@ describe MergeRequest, models: true do end describe '#resolvable_discussions' do - before do - allow(first_discussion).to receive(:to_be_resolved?).and_return(true) - allow(second_discussion).to receive(:to_be_resolved?).and_return(false) - allow(third_discussion).to receive(:to_be_resolved?).and_return(false) - end - - it 'includes only discussions that need to be resolved' do - expect(subject.resolvable_discussions).to eq([first_discussion]) - end + # TODO: Test end describe "#discussions_resolvable?" do @@ -1372,7 +1364,15 @@ describe MergeRequest, models: true do end describe "#discussions_to_be_resolved" do - # TODO: Test + before do + allow(first_discussion).to receive(:to_be_resolved?).and_return(true) + allow(second_discussion).to receive(:to_be_resolved?).and_return(false) + allow(third_discussion).to receive(:to_be_resolved?).and_return(false) + end + + it 'includes only discussions that need to be resolved' do + expect(subject.discussions_to_be_resolved).to eq([first_discussion]) + end end describe '#discussions_can_be_resolved_by?' do |