BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
16e584c7
Commit
16e584c7
authored
Apr 10, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move PipelineFailed vue component
parent
a56611e3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
16 deletions
+31
-16
pipeline_failed.vue
...erge_request_widget/components/states/pipeline_failed.vue
+18
-11
dependencies.js
...sets/javascripts/vue_merge_request_widget/dependencies.js
+1
-1
move-pipeline-failed-vue-component.yml
changelogs/unreleased/move-pipeline-failed-vue-component.yml
+5
-0
mr_widget_pipeline_failed_spec.js
...idget/components/states/mr_widget_pipeline_failed_spec.js
+7
-4
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/
mr_widget_pipeline_failed.js
→
app/assets/javascripts/vue_merge_request_widget/components/states/
pipeline_failed.vue
View file @
16e584c7
<
script
>
import
statusIcon
from
'../mr_widget_status_icon.vue'
;
export
default
{
name
:
'
MRWidgetPipelineBlock
ed'
,
name
:
'
PipelineFail
ed'
,
components
:
{
statusIcon
,
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="warning" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure
</span>
</div>
</div>
`
,
};
</
script
>
<
template
>
<div
class=
"mr-widget-body media"
>
<status-icon
status=
"warning"
:show-disabled-button=
"true"
/>
<div
class=
"media-body space-children"
>
<span
class=
"bold"
>
{{
s__
(
`mrWidget|The pipeline for this merge request failed.
Please retry the job or push a new commit to fix the failure`
)
}}
</span>
</div>
</div>
</
template
>
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @
16e584c7
...
...
@@ -31,7 +31,7 @@ export { default as ReadyToMergeState } from './components/states/ready_to_merge
export
{
default
as
ShaMismatchState
}
from
'./components/states/sha_mismatch.vue'
;
export
{
default
as
UnresolvedDiscussionsState
}
from
'./components/states/unresolved_discussions.vue'
;
export
{
default
as
PipelineBlockedState
}
from
'./components/states/mr_widget_pipeline_blocked.vue'
;
export
{
default
as
PipelineFailedState
}
from
'./components/states/
mr_widget_pipeline_failed
'
;
export
{
default
as
PipelineFailedState
}
from
'./components/states/
pipeline_failed.vue
'
;
export
{
default
as
MergeWhenPipelineSucceedsState
}
from
'./components/states/mr_widget_merge_when_pipeline_succeeds.vue'
;
export
{
default
as
RebaseState
}
from
'./components/states/mr_widget_rebase.vue'
;
export
{
default
as
AutoMergeFailed
}
from
'./components/states/mr_widget_auto_merge_failed.vue'
;
...
...
changelogs/unreleased/move-pipeline-failed-vue-component.yml
0 → 100644
View file @
16e584c7
---
title
:
Move PipelineFailed vue component
merge_request
:
18277
author
:
George Tsiolis
type
:
performance
spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js
View file @
16e584c7
import
Vue
from
'vue'
;
import
pipelineFailedComponent
from
'~/vue_merge_request_widget/components/states/mr_widget_pipeline_failed'
;
import
PipelineFailed
from
'~/vue_merge_request_widget/components/states/pipeline_failed.vue'
;
import
{
removeBreakLine
}
from
'spec/helpers/vue_component_helper'
;
describe
(
'
MRWidget
PipelineFailed'
,
()
=>
{
describe
(
'PipelineFailed'
,
()
=>
{
describe
(
'template'
,
()
=>
{
const
Component
=
Vue
.
extend
(
pipelineFailedComponent
);
const
Component
=
Vue
.
extend
(
PipelineFailed
);
const
vm
=
new
Component
({
el
:
document
.
createElement
(
'div'
),
});
it
(
'should have correct elements'
,
()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'mr-widget-body'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'button'
).
getAttribute
(
'disabled'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
innerText
).
toContain
(
'The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure'
);
expect
(
removeBreakLine
(
vm
.
$el
.
innerText
).
trim
(),
).
toContain
(
'The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure'
);
});
});
});
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