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

Tests are fixed now

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-05 12:12:02 +02:00
parent 0a94640e32
commit e3d7ce2cc4
6 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/models/merge_request_spec.rb
View file

@ -40,7 +40,7 @@ describe MergeRequest do
let!(:merge_request) { create(:merge_request) }
before do
merge_request.stub(:commits) { [merge_request.project.commit] }
merge_request.stub(:commits) { [merge_request.project.repository.commit] }
create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit')
create(:note, noteable: merge_request)
end

9
spec/models/protected_branch_spec.rb
View file

@ -39,13 +39,4 @@ describe ProtectedBranch do
branch.destroy
end
end
describe '#commit' do
let(:branch) { create(:protected_branch) }
it 'commits itself to its project' do
branch.project.repository.should_receive(:commit).with(branch.name)
branch.commit
end
end
end