diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-20 13:06:52 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-11-20 14:46:21 +0000 |
| commit | febc473f541b2c82ec811b1540b2a7ceec8131ca (patch) | |
| tree | c1c198a23d16750530fb985523f5295ab354713c | |
| parent | 2ea250d4bff03b656403e85db14cc5a4be593c67 (diff) | |
| download | gitlab-ce-53578-fe-deployment-status.tar.gz | |
Adds missing status in deployment widget53578-fe-deployment-status
Renders created and canceled status in MR widget
4 files changed, 38 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index fe741dc60cb..99ee2a3734d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -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 { diff --git a/changelogs/unreleased/53578-fe-deployment-status.yml b/changelogs/unreleased/53578-fe-deployment-status.yml new file mode 100644 index 00000000000..b88bd70ee2e --- /dev/null +++ b/changelogs/unreleased/53578-fe-deployment-status.yml @@ -0,0 +1,5 @@ +--- +title: Adds states to the deployment widget +merge_request: +author: +type: added diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8b27870a583..d74b9633821 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7191,6 +7191,9 @@ msgstr "" msgid "Wiki|Wiki Pages" msgstr "" +msgid "Will deploy to" +msgstr "" + msgid "Withdraw Access Request" msgstr "" diff --git a/spec/javascripts/vue_mr_widget/components/deployment_spec.js b/spec/javascripts/vue_mr_widget/components/deployment_spec.js index 056b4df8fdc..e355416bd27 100644 --- a/spec/javascripts/vue_mr_widget/components/deployment_spec.js +++ b/spec/javascripts/vue_mr_widget/components/deployment_spec.js @@ -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', + ); + }); + }); }); }); |