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
22efefe7
Commit
22efefe7
authored
Apr 11, 2017
by
Jose Ivan Vargas
Committed by
Stan Hu
Apr 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added tests and fixed a typo
parent
78523461
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
app/views/projects/merge_requests/widget/open/_accept.html.haml
...ews/projects/merge_requests/widget/open/_accept.html.haml
+1
-1
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
...tures/merge_requests/merge_when_pipeline_succeeds_spec.rb
+13
-0
No files found.
app/views/projects/merge_requests/widget/open/_accept.html.haml
View file @
22efefe7
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
Select merge moment
Select merge moment
%ul
.js-merge-dropdown.dropdown-menu.dropdown-menu-right
{
role:
'menu'
}
%ul
.js-merge-dropdown.dropdown-menu.dropdown-menu-right
{
role:
'menu'
}
%li
%li
=
link_to
"#"
,
class:
"merge-when-pipeline
_
succeeds"
do
=
link_to
"#"
,
class:
"merge-when-pipeline
-
succeeds"
do
=
icon
(
'check fw'
)
=
icon
(
'check fw'
)
Merge when pipeline succeeds
Merge when pipeline succeeds
%li
%li
...
...
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
View file @
22efefe7
...
@@ -89,6 +89,19 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
...
@@ -89,6 +89,19 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
it_behaves_like
'Merge when pipeline succeeds activator'
it_behaves_like
'Merge when pipeline succeeds activator'
end
end
end
end
describe
'enabling Merge when pipeline succeeds via dropdown'
do
it
'activates the Merge when pipeline succeeds feature'
do
click_button
'Select merge moment'
within
(
'.js-merge-dropdown'
)
do
click_link
'Merge when pipeline succeeds'
end
expect
(
page
).
to
have_content
"Set by
#{
user
.
name
}
to be merged automatically when the pipeline succeeds."
expect
(
page
).
to
have_content
"The source branch will not be removed."
expect
(
page
).
to
have_link
"Cancel automatic merge"
end
end
end
end
context
'when merge when pipeline succeeds is enabled'
do
context
'when merge when pipeline succeeds is enabled'
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