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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b37069b7
Commit
b37069b7
authored
Sep 26, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add test for EE-only for "semi-linear history" strategy
parent
a8bc3076
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
0 deletions
+20
-0
spec/ee/spec/features/projects/project_settings_spec.rb
spec/ee/spec/features/projects/project_settings_spec.rb
+20
-0
No files found.
spec/ee/spec/features/projects/project_settings_spec.rb
0 → 100644
View file @
b37069b7
require
'spec_helper'
describe
'Edit Project Settings'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
user
.
namespace
,
path:
'gitlab'
,
name:
'sample'
)
}
before
do
sign_in
(
user
)
end
describe
'Merge request settings section'
do
it
'shows "Merge commit with semi-linear history " strategy'
do
visit
edit_project_path
(
project
)
page
.
within
'.merge-requests-feature'
do
expect
(
page
).
to
have_content
'Merge commit with semi-linear history'
end
end
end
end
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