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

Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2

Browse source 
Conflicts:
	app/models/merge_request.rb
This commit is contained in:
Dmitriy Zaporozhets 2013-02-26 10:38:40 +02:00
commit d7b667fee2
10 changed files with 97 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/models/merge_request_spec.rb
View file

@ -32,6 +32,12 @@ describe MergeRequest do
it { should_not allow_mass_assignment_of(:project_id) }
end
describe "Respond to" do
it { should respond_to(:unchecked?) }
it { should respond_to(:can_be_merged?) }
it { should respond_to(:cannot_be_merged?) }
end
describe 'modules' do
it { should include_module(Issuable) }
end