Commit 19a62632 authored by Valery Sizov's avatar Valery Sizov

Add spec for Project#merge_method

It should be deleted from EE side when doing CE->EE merge!
parent 3940ac85
...@@ -408,6 +408,18 @@ describe Project do ...@@ -408,6 +408,18 @@ describe Project do
end end
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 describe '#repository_storage_path' do
let(:project) { create(:project, repository_storage: 'custom') } let(:project) { create(:project, repository_storage: 'custom') }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment