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
0ea54833
Commit
0ea54833
authored
Dec 28, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix failing tests
parent
ba5ba96f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
spec/features/merge_requests/deleted_source_branch_spec.rb
spec/features/merge_requests/deleted_source_branch_spec.rb
+14
-5
No files found.
spec/features/merge_requests/deleted_source_branch_spec.rb
View file @
0ea54833
...
...
@@ -4,6 +4,8 @@ require 'spec_helper'
# message to be shown by JavaScript when the source branch was deleted.
# Please do not remove "js: true".
describe
'Deleted source branch'
,
feature:
true
,
js:
true
do
include
WaitForAjax
let
(
:user
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
)
}
...
...
@@ -13,7 +15,8 @@ describe 'Deleted source branch', feature: true, js: true do
merge_request
.
update!
(
source_branch:
'this-branch-does-not-exist'
)
visit
namespace_project_merge_request_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
merge_request
merge_request
.
project
,
merge_request
)
end
...
...
@@ -23,11 +26,17 @@ describe 'Deleted source branch', feature: true, js: true do
)
end
it
'
hide
s Discussion, Commits and Changes tabs'
do
it
'
still contain
s Discussion, Commits and Changes tabs'
do
within
'.merge-request-details'
do
expect
(
page
).
to
have_
no_
content
(
'Discussion'
)
expect
(
page
).
to
have_
no_
content
(
'Commits'
)
expect
(
page
).
to
have_
no_
content
(
'Changes'
)
expect
(
page
).
to
have_content
(
'Discussion'
)
expect
(
page
).
to
have_content
(
'Commits'
)
expect
(
page
).
to
have_content
(
'Changes'
)
end
click_on
'Changes'
wait_for_ajax
expect
(
page
).
to
have_selector
(
'.diffs.tab-pane .nothing-here-block'
)
expect
(
page
).
to
have_content
(
'Nothing to merge from this-branch-does-not-exist into feature'
)
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