summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-02-22 09:21:05 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-02-22 09:21:05 +0000
commit914533128e37420f7c86476d967102abf9ef7796 (patch)
tree7793eb5d1ba9d6af7ebaef3cd356170368fa63cb /spec
parent15196f926915e754d169ba814d71fcc1e27e35c6 (diff)
parentad860cc0efc2d513017ca9b491b2ba68874e1fe9 (diff)
downloadgitlab-ce-914533128e37420f7c86476d967102abf9ef7796.tar.gz
Merge branch '42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation' into 'master'
Resolve "Followup to New design for cancel/stop pipeline confirmation" Closes #42886 See merge request gitlab-org/gitlab-ce!17106
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/pipelines/async_button_spec.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/javascripts/pipelines/async_button_spec.js b/spec/javascripts/pipelines/async_button_spec.js
index 8ce33d410a7..e0ea3649646 100644
--- a/spec/javascripts/pipelines/async_button_spec.js
+++ b/spec/javascripts/pipelines/async_button_spec.js
@@ -15,7 +15,8 @@ describe('Pipelines Async Button', () => {
title: 'Foo',
icon: 'repeat',
cssClass: 'bar',
- id: 123,
+ pipelineId: 123,
+ type: 'explode',
},
}).$mount();
});
@@ -39,8 +40,9 @@ describe('Pipelines Async Button', () => {
describe('With confirm dialog', () => {
it('should call the service when confimation is positive', () => {
- eventHub.$on('actionConfirmationModal', (data) => {
- expect(data.id).toEqual(123);
+ eventHub.$on('openConfirmationModal', (data) => {
+ expect(data.pipelineId).toEqual(123);
+ expect(data.type).toEqual('explode');
});
component = new AsyncButtonComponent({
@@ -49,7 +51,8 @@ describe('Pipelines Async Button', () => {
title: 'Foo',
icon: 'fa fa-foo',
cssClass: 'bar',
- id: 123,
+ pipelineId: 123,
+ type: 'explode',
},
}).$mount();