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
1849336a
Commit
1849336a
authored
Sep 19, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port fast-forward widget_spec test from EE
parent
fab5567a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
0 deletions
+22
-0
spec/features/merge_requests/widget_spec.rb
spec/features/merge_requests/widget_spec.rb
+22
-0
No files found.
spec/features/merge_requests/widget_spec.rb
View file @
1849336a
...
...
@@ -202,6 +202,28 @@ describe 'Merge request', :js do
end
end
context
'view merge request where fast-forward merge is not possible'
do
before
do
project
.
update
(
merge_requests_ff_only_enabled:
true
)
merge_request
.
update
(
merge_user:
merge_request
.
author
,
merge_status: :cannot_be_merged
)
visit
project_merge_request_path
(
project
,
merge_request
)
end
it
'shows information about the merge error'
do
# Wait for the `ci_status` and `merge_check` requests
wait_for_requests
page
.
within
(
'.mr-widget-body'
)
do
expect
(
page
).
to
have_content
(
'Fast-forward merge is not possible'
)
end
end
end
context
'merge error'
do
before
do
allow_any_instance_of
(
Repository
).
to
receive
(
:merge
).
and_return
(
false
)
...
...
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