Add test to check for project settings merge strategies
This commit is contained in:
parent
a48c07da98
commit
59d631371c
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue