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
Léo-Paul Géneau
gitlab-ce
Commits
6eb75ed6
Commit
6eb75ed6
authored
Dec 07, 2015
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
cfc95b82
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
spec/features/merge_requests/merge_when_build_succeeds_spec.rb
...features/merge_requests/merge_when_build_succeeds_spec.rb
+4
-4
No files found.
spec/features/merge_requests/merge_when_build_succeeds_spec.rb
View file @
6eb75ed6
...
@@ -23,12 +23,12 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
...
@@ -23,12 +23,12 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
end
end
it
'displays the Merge When Build Succeeds button'
do
it
'displays the Merge When Build Succeeds button'
do
expect
(
page
).
to
have_
button
"Merge When Build Succeeds"
expect
(
page
).
to
have_
link
"Merge When Build Succeeds"
end
end
context
"Merge When Build succeeds enabled"
do
context
"Merge When Build succeeds enabled"
do
before
do
before
do
click_
button
"Merge When Build Succeeds"
click_
link
"Merge When Build Succeeds"
end
end
it
'activates Merge When Build Succeeds feature'
do
it
'activates Merge When Build Succeeds feature'
do
...
@@ -65,7 +65,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
...
@@ -65,7 +65,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
it
'cancels the automatic merge'
do
it
'cancels the automatic merge'
do
click_link
"Cancel Automatic Merge"
click_link
"Cancel Automatic Merge"
expect
(
page
).
to
have_
button
"Merge When Build Succeeds"
expect
(
page
).
to
have_
link
"Merge When Build Succeeds"
visit_merge_request
(
merge_request
)
# Needed to refresh the page
visit_merge_request
(
merge_request
)
# Needed to refresh the page
expect
(
page
).
to
have_content
"Canceled the automatic merge"
expect
(
page
).
to
have_content
"Canceled the automatic merge"
...
@@ -82,7 +82,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
...
@@ -82,7 +82,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
context
'Build is not active'
do
context
'Build is not active'
do
it
"should not allow for enabling"
do
it
"should not allow for enabling"
do
visit_merge_request
(
merge_request
)
visit_merge_request
(
merge_request
)
expect
(
page
).
not_to
have_
button
"Merge When Build Succeeds"
expect
(
page
).
not_to
have_
link
"Merge When Build Succeeds"
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