Commit 59d63137 authored by Eric Eastwood's avatar Eric Eastwood

Add test to check for project settings merge strategies

parent a48c07da
...@@ -32,6 +32,24 @@ describe 'Edit Project Settings' do ...@@ -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
......
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