Add test to check for project settings merge strategies

This commit is contained in:
Eric Eastwood 2017-09-26 15:03:24 -05:00
parent a48c07da98
commit 59d631371c
1 changed files with 18 additions and 0 deletions

View File

@ -32,6 +32,24 @@ describe 'Edit Project Settings' do
end end
end end
describe 'Merge request settings section' do
it 'shows "Merge commit" strategy' do
visit edit_project_path(project)
page.within '.merge-requests-feature' do
expect(page).to have_content 'Merge commit'
end
end
it 'shows "Fast-forward merge" strategy' do
visit edit_project_path(project)
page.within '.merge-requests-feature' do
expect(page).to have_content 'Fast-forward merge'
end
end
end
describe 'Rename repository section' do describe 'Rename repository section' do
context 'with invalid characters' do context 'with invalid characters' do
it 'shows errors for invalid project path/name' do it 'shows errors for invalid project path/name' do