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
6329ef28
Commit
6329ef28
authored
Dec 15, 2017
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix karma
parent
09202a46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
...uest_widget/components/states/mr_widget_ready_to_merge.js
+2
-2
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
...widget/components/states/mr_widget_ready_to_merge_spec.js
+5
-5
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @
6329ef28
...
...
@@ -42,13 +42,13 @@ export default {
const
{
pipeline
,
isPipelineActive
,
isPipelineFailed
,
hasCI
,
ciStatus
}
=
this
.
mr
;
if
(
hasCI
&&
!
ciStatus
)
{
return
'
warning
'
;
return
'
failed
'
;
}
else
if
(
!
pipeline
)
{
return
'
success
'
;
}
else
if
(
isPipelineActive
)
{
return
'
pending
'
;
}
else
if
(
isPipelineFailed
)
{
return
'
warning
'
;
return
'
failed
'
;
}
return
'
success
'
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @
6329ef28
...
...
@@ -36,7 +36,7 @@ const createComponent = (customConfig = {}) => {
});
};
describe
(
'
MRWidgetReadyToMerge
'
,
()
=>
{
f
describe
(
'
MRWidgetReadyToMerge
'
,
()
=>
{
let
vm
;
beforeEach
(()
=>
{
...
...
@@ -170,14 +170,14 @@ describe('MRWidgetReadyToMerge', () => {
expect
(
vm
.
iconClass
).
toEqual
(
'
success
'
);
});
it
(
'
shows
x
for failed status
'
,
()
=>
{
it
(
'
shows
warning icon
for failed status
'
,
()
=>
{
vm
.
mr
.
hasCI
=
true
;
expect
(
vm
.
iconClass
).
toEqual
(
'
failed
'
);
expect
(
vm
.
iconClass
).
toEqual
(
'
warning
'
);
});
it
(
'
shows
x
for merge not allowed
'
,
()
=>
{
it
(
'
shows
warning icon
for merge not allowed
'
,
()
=>
{
vm
.
mr
.
hasCI
=
true
;
expect
(
vm
.
iconClass
).
toEqual
(
'
failed
'
);
expect
(
vm
.
iconClass
).
toEqual
(
'
warning
'
);
});
});
...
...
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