Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
59d63137
Commit
59d63137
authored
Sep 26, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add test to check for project settings merge strategies
parent
a48c07da
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
0 deletions
+18
-0
spec/features/projects/project_settings_spec.rb
spec/features/projects/project_settings_spec.rb
+18
-0
No files found.
spec/features/projects/project_settings_spec.rb
View file @
59d63137
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment