deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make MRs also count and display its commits' notes

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-05 00:25:40 +02:00
parent 77bde9a0e4
commit 6dc8c0eac2
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spec/models/merge_request_spec.rb
View file

@ -35,4 +35,19 @@ describe MergeRequest do
it { should include_module(IssueCommonality) }
it { should include_module(Votes) }
end
describe "#mr_and_commit_notes" do
let!(:merge_request) { Factory.create(:merge_request) }
before do
merge_request.stub(:commits) { [merge_request.project.commit] }
Factory.create(:note, noteable: merge_request.commits.first)
Factory.create(:note, noteable: merge_request)
end
it "should include notes for commits" do
merge_request.commits.should_not be_empty
merge_request.mr_and_commit_notes.count.should == 2
end
end
end