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
61625d8b
Commit
61625d8b
authored
Mar 13, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed EE MR widget options spec
parent
3dbcebb7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletion
+17
-1
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
+17
-1
No files found.
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
View file @
61625d8b
...
@@ -783,15 +783,18 @@ describe('ee merge request widget options', () => {
...
@@ -783,15 +783,18 @@ describe('ee merge request widget options', () => {
});
});
describe
(
'
rendering source branch removal status
'
,
()
=>
{
describe
(
'
rendering source branch removal status
'
,
()
=>
{
it
(
'
renders when user cannot remove branch and branch should be removed
'
,
(
done
)
=>
{
beforeEach
((
)
=>
{
vm
=
mountComponent
(
Component
,
{
vm
=
mountComponent
(
Component
,
{
mrData
:
{
mrData
:
{
...
mockData
,
...
mockData
,
},
},
});
});
});
it
(
'
renders when user cannot remove branch and branch should be removed
'
,
(
done
)
=>
{
vm
.
mr
.
canRemoveSourceBranch
=
false
;
vm
.
mr
.
canRemoveSourceBranch
=
false
;
vm
.
mr
.
shouldRemoveSourceBranch
=
true
;
vm
.
mr
.
shouldRemoveSourceBranch
=
true
;
vm
.
mr
.
state
=
'
readyToMerge
'
;
vm
.
$nextTick
(()
=>
{
vm
.
$nextTick
(()
=>
{
const
tooltip
=
vm
.
$el
.
querySelector
(
'
.fa-question-circle
'
);
const
tooltip
=
vm
.
$el
.
querySelector
(
'
.fa-question-circle
'
);
...
@@ -804,5 +807,18 @@ describe('ee merge request widget options', () => {
...
@@ -804,5 +807,18 @@ describe('ee merge request widget options', () => {
done
();
done
();
});
});
});
});
it
(
'
does not render in merged state
'
,
(
done
)
=>
{
vm
.
mr
.
canRemoveSourceBranch
=
false
;
vm
.
mr
.
shouldRemoveSourceBranch
=
true
;
vm
.
mr
.
state
=
'
merged
'
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
textContent
).
toContain
(
'
The source branch has been removed
'
);
expect
(
vm
.
$el
.
textContent
).
not
.
toContain
(
'
Removes source branch
'
);
done
();
});
});
});
});
});
});
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