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
e351ed2d
Commit
e351ed2d
authored
Oct 07, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add test that checks actual merge for MWBS feature
parent
2f66969e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
spec/features/merge_requests/merge_when_build_succeeds_spec.rb
...features/merge_requests/merge_when_build_succeeds_spec.rb
+13
-2
No files found.
spec/features/merge_requests/merge_when_build_succeeds_spec.rb
View file @
e351ed2d
...
@@ -58,7 +58,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
...
@@ -58,7 +58,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
merge_when_build_succeeds:
true
)
merge_when_build_succeeds:
true
)
end
end
background
do
let!
(
:build
)
do
create
(
:ci_build
,
pipeline:
pipeline
)
create
(
:ci_build
,
pipeline:
pipeline
)
end
end
...
@@ -72,7 +72,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
...
@@ -72,7 +72,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
expect
(
page
).
to
have_button
"Merge When Build Succeeds"
expect
(
page
).
to
have_button
"Merge When Build Succeeds"
visit_merge_request
(
merge_request
)
#
Needed to
refresh the page
visit_merge_request
(
merge_request
)
# refresh the page
expect
(
page
).
to
have_content
"Canceled the automatic merge"
expect
(
page
).
to
have_content
"Canceled the automatic merge"
end
end
...
@@ -82,6 +82,17 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
...
@@ -82,6 +82,17 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
click_link
"Remove Source Branch When Merged"
click_link
"Remove Source Branch When Merged"
expect
(
page
).
to
have_content
"The source branch will be removed"
expect
(
page
).
to
have_content
"The source branch will be removed"
end
end
context
'when build succeeds'
do
background
{
build
.
success
}
it
'merges merge request'
do
visit_merge_request
(
merge_request
)
# refresh the page
expect
(
page
).
to
have_content
'The changes were merged'
expect
(
merge_request
.
reload
).
to
be_merged
end
end
end
end
context
'when build is not active'
do
context
'when build is not active'
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