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
dddda49f
Commit
dddda49f
authored
Feb 03, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec/features/merge_requests/create_new_mr_spec.rb spec failures
parent
5fb3a786
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
spec/features/merge_requests/create_new_mr_spec.rb
spec/features/merge_requests/create_new_mr_spec.rb
+2
-2
No files found.
spec/features/merge_requests/create_new_mr_spec.rb
View file @
dddda49f
...
@@ -36,7 +36,7 @@ feature 'Create New Merge Request', feature: true, js: true do
...
@@ -36,7 +36,7 @@ feature 'Create New Merge Request', feature: true, js: true do
context
'when approvals are disabled for the target project'
do
context
'when approvals are disabled for the target project'
do
it
'does not show approval settings'
do
it
'does not show approval settings'
do
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
source_branch:
'feature_conflict'
})
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'feature_conflict'
})
expect
(
page
).
not_to
have_content
(
'Approvers'
)
expect
(
page
).
not_to
have_content
(
'Approvers'
)
end
end
...
@@ -46,7 +46,7 @@ feature 'Create New Merge Request', feature: true, js: true do
...
@@ -46,7 +46,7 @@ feature 'Create New Merge Request', feature: true, js: true do
before
do
before
do
project
.
update_attributes
(
approvals_before_merge:
1
)
project
.
update_attributes
(
approvals_before_merge:
1
)
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
source_branch:
'feature_conflict'
})
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'feature_conflict'
})
end
end
it
'shows approval settings'
do
it
'shows approval settings'
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