diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-06-03 14:23:40 -0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-06-12 16:23:34 +0800 |
| commit | 059b3e369ddea3cab03eccf3c1c18546a62b9c13 (patch) | |
| tree | c3f8787208629045e3d6300fecc6937e1b64f917 /spec/javascripts | |
| parent | e206e66bbba9e36a75eb485f65c26f1d5a05e90f (diff) | |
| download | gitlab-ce-059b3e369ddea3cab03eccf3c1c18546a62b9c13.tar.gz | |
Remove "target branch advanced" warning from FE code (CE)ce-remove-merge-request-pipeline-checkes
Removes the "target branch advanced" warning from the frontend
as it is no longer needed due to the new merge trains feature.
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/mr_widget_options_spec.js | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js index 918717c4547..08f7a17515e 100644 --- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js +++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js @@ -222,60 +222,6 @@ describe('mrWidgetOptions', () => { }); }); }); - - describe('showTargetBranchAdvancedError', () => { - describe(`when the pipeline's target_sha property doesn't exist`, () => { - beforeEach(done => { - Vue.set(vm.mr, 'isOpen', true); - Vue.set(vm.mr.pipeline, 'target_sha', undefined); - Vue.set(vm.mr, 'targetBranchSha', 'abcd'); - vm.$nextTick(done); - }); - - it('should be false', () => { - expect(vm.showTargetBranchAdvancedError).toEqual(false); - }); - }); - - describe(`when the pipeline's target_sha matches the target branch's sha`, () => { - beforeEach(done => { - Vue.set(vm.mr, 'isOpen', true); - Vue.set(vm.mr.pipeline, 'target_sha', 'abcd'); - Vue.set(vm.mr, 'targetBranchSha', 'abcd'); - vm.$nextTick(done); - }); - - it('should be false', () => { - expect(vm.showTargetBranchAdvancedError).toEqual(false); - }); - }); - - describe(`when the merge request is not open`, () => { - beforeEach(done => { - Vue.set(vm.mr, 'isOpen', false); - Vue.set(vm.mr.pipeline, 'target_sha', 'abcd'); - Vue.set(vm.mr, 'targetBranchSha', 'bcde'); - vm.$nextTick(done); - }); - - it('should be false', () => { - expect(vm.showTargetBranchAdvancedError).toEqual(false); - }); - }); - - describe(`when the pipeline's target_sha does not match the target branch's sha`, () => { - beforeEach(done => { - Vue.set(vm.mr, 'isOpen', true); - Vue.set(vm.mr.pipeline, 'target_sha', 'abcd'); - Vue.set(vm.mr, 'targetBranchSha', 'bcde'); - vm.$nextTick(done); - }); - - it('should be true', () => { - expect(vm.showTargetBranchAdvancedError).toEqual(true); - }); - }); - }); }); describe('methods', () => { |
