Commit 685e14f8 authored by Phil Hughes's avatar Phil Hughes

Merge branch '53578-fe-deployment-status' into 'master'

Adds missing status in deployment widget

See merge request gitlab-org/gitlab-ce!23239
parents b8dd1425 febc473f
......@@ -42,6 +42,8 @@ export default {
running: __('Deploying to'),
success: __('Deployed to'),
failed: __('Failed to deploy to'),
created: __('Will deploy to'),
canceled: __('Failed to deploy to'),
},
data() {
return {
......
---
title: Adds states to the deployment widget
merge_request:
author:
type: added
......@@ -7245,6 +7245,9 @@ msgstr ""
msgid "Wiki|Wiki Pages"
msgstr ""
msgid "Will deploy to"
msgstr ""
msgid "Withdraw Access Request"
msgstr ""
......
......@@ -252,5 +252,33 @@ describe('Deployment component', () => {
);
});
});
describe('created', () => {
beforeEach(() => {
vm = mountComponent(Component, {
deployment: Object.assign({}, deploymentMockData, { status: 'created' }),
showMetrics: true,
});
});
it('renders information about created deployment', () => {
expect(vm.$el.querySelector('.js-deployment-info').textContent).toContain('Will deploy to');
});
});
describe('canceled', () => {
beforeEach(() => {
vm = mountComponent(Component, {
deployment: Object.assign({}, deploymentMockData, { status: 'canceled' }),
showMetrics: true,
});
});
it('renders information about canceled deployment', () => {
expect(vm.$el.querySelector('.js-deployment-info').textContent).toContain(
'Failed to deploy to',
);
});
});
});
});
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment