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
099a9e01
Commit
099a9e01
authored
May 25, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update MWPS feature spec per change to remove source branch default.
parent
08a7073e
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/merge_when_pipeline_succeeds_spec.rb
...tures/merge_requests/merge_when_pipeline_succeeds_spec.rb
+2
-2
No files found.
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
View file @
099a9e01
...
@@ -42,7 +42,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
...
@@ -42,7 +42,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
click_button
"Merge when pipeline succeeds"
click_button
"Merge when pipeline succeeds"
expect
(
page
).
to
have_content
"Set by
#{
user
.
name
}
to be merged automatically when the pipeline succeeds."
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 be removed."
expect
(
page
).
to
have_content
"The source branch will
not
be removed."
expect
(
page
).
to
have_selector
".js-cancel-auto-merge"
expect
(
page
).
to
have_selector
".js-cancel-auto-merge"
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
/enabled an automatic merge when the pipeline for \h{8} succeeds/i
expect
(
page
).
to
have_content
/enabled an automatic merge when the pipeline for \h{8} succeeds/i
...
@@ -101,7 +101,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
...
@@ -101,7 +101,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
click_link
'Merge when pipeline succeeds'
click_link
'Merge when pipeline succeeds'
expect
(
page
).
to
have_content
"Set by
#{
user
.
name
}
to be merged automatically when the pipeline succeeds."
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 be removed."
expect
(
page
).
to
have_content
"The source branch will
not
be removed."
expect
(
page
).
to
have_link
"Cancel automatic merge"
expect
(
page
).
to
have_link
"Cancel automatic merge"
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