kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add spec for Project#merge_method

Browse source 
It should be deleted from EE side when doing CE->EE merge!
This commit is contained in:
Valery Sizov 2017-09-20 13:31:39 +03:00
parent 3940ac8520
commit 19a62632f7
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
spec/models/project_spec.rb
View file

@ -408,6 +408,18 @@ describe Project do
end
end
describe '#merge_method' do
it 'returns "ff" merge_method when ff is enabled' do
project = build(:project, merge_requests_ff_only_enabled: true)
expect(project.merge_method).to be :ff
end
it 'returns "merge" merge_method when ff is disabled' do
project = build(:project, merge_requests_ff_only_enabled: false)
expect(project.merge_method).to be :merge
end
end
describe '#repository_storage_path' do
let(:project) { create(:project, repository_storage: 'custom') }