diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 09:08:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 09:08:47 +0000 |
commit | 66d4203791a01fdedf668a78818a229ea2c07aad (patch) | |
tree | 374fc9f6c5e709cf6ab48e257e6bfe4a504d6bbb /spec/javascripts | |
parent | a496f41f60e12a0a5c31482b7594ad547e0ade42 (diff) | |
download | gitlab-ce-66d4203791a01fdedf668a78818a229ea2c07aad.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js | 16 | ||||
-rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index 6c44ffc6ec9..d396f2d9271 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -145,34 +145,30 @@ describe('ReadyToMerge', () => { }); }); - describe('mergeButtonClass', () => { - const defaultClass = 'btn btn-sm btn-success accept-merge-request'; - const failedClass = `${defaultClass} btn-danger`; - const inActionClass = `${defaultClass} btn-info`; - + describe('mergeButtonVariant', () => { it('defaults to success class', () => { Vue.set(vm.mr, 'availableAutoMergeStrategies', []); - expect(vm.mergeButtonClass).toEqual(defaultClass); + expect(vm.mergeButtonVariant).toEqual('success'); }); it('returns success class for success status', () => { Vue.set(vm.mr, 'availableAutoMergeStrategies', []); Vue.set(vm.mr, 'pipeline', true); - expect(vm.mergeButtonClass).toEqual(defaultClass); + expect(vm.mergeButtonVariant).toEqual('success'); }); it('returns info class for pending status', () => { Vue.set(vm.mr, 'availableAutoMergeStrategies', [MTWPS_MERGE_STRATEGY]); - expect(vm.mergeButtonClass).toEqual(inActionClass); + expect(vm.mergeButtonVariant).toEqual('info'); }); - it('returns failed class for failed status', () => { + it('returns danger class for failed status', () => { vm.mr.hasCI = true; - expect(vm.mergeButtonClass).toEqual(failedClass); + expect(vm.mergeButtonVariant).toEqual('danger'); }); }); diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js index 5844dad42ff..9153231b974 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js @@ -43,7 +43,7 @@ describe('Wip', () => { is_new_mr_data: true, }; - describe('removeWIP', () => { + describe('handleRemoveWIP', () => { it('should make a request to service and handle response', done => { const vm = createComponent(); @@ -57,7 +57,7 @@ describe('Wip', () => { }), ); - vm.removeWIP(); + vm.handleRemoveWIP(); setTimeout(() => { expect(vm.isMakingRequest).toBeTruthy(); expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj); |