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
b8e10e32
Commit
b8e10e32
authored
Nov 25, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests for allowing merged if pipeline succeeded
parent
895d97af
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/only_allow_merge_if_build_succeeds_spec.rb
...merge_requests/only_allow_merge_if_build_succeeds_spec.rb
+2
-2
No files found.
spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
View file @
b8e10e32
...
@@ -38,7 +38,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
...
@@ -38,7 +38,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
it
'does not allow to merge immediately'
do
it
'does not allow to merge immediately'
do
visit_merge_request
(
merge_request
)
visit_merge_request
(
merge_request
)
expect
(
page
).
to
have_button
'Merge When
Build
Succeeds'
expect
(
page
).
to
have_button
'Merge When
Pipeline
Succeeds'
expect
(
page
).
not_to
have_button
'Select Merge Moment'
expect
(
page
).
not_to
have_button
'Select Merge Moment'
end
end
end
end
...
@@ -97,7 +97,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
...
@@ -97,7 +97,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
it
'allows MR to be merged immediately'
,
js:
true
do
it
'allows MR to be merged immediately'
,
js:
true
do
visit_merge_request
(
merge_request
)
visit_merge_request
(
merge_request
)
expect
(
page
).
to
have_button
'Merge When
Build
Succeeds'
expect
(
page
).
to
have_button
'Merge When
Pipeline
Succeeds'
click_button
'Select Merge Moment'
click_button
'Select Merge Moment'
expect
(
page
).
to
have_content
'Merge Immediately'
expect
(
page
).
to
have_content
'Merge Immediately'
...
...
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