diff options
author | winh <winnie@gitlab.com> | 2017-06-21 15:25:11 +0200 |
---|---|---|
committer | winh <winnie@gitlab.com> | 2017-06-21 15:25:11 +0200 |
commit | 40eb82536836904b87c89b2e2d4653c7503fdfd8 (patch) | |
tree | 7b1553f815ad6e5793875bcabdddcaeb3634fb16 /spec/javascripts/vue_mr_widget/mr_widget_options_spec.js | |
parent | cf3cdd48bb4959cb277752a16a4b98b7f4a4f3c4 (diff) | |
download | gitlab-ce-40eb82536836904b87c89b2e2d4653c7503fdfd8.tar.gz |
Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d
This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing
changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf.
Diffstat (limited to 'spec/javascripts/vue_mr_widget/mr_widget_options_spec.js')
-rw-r--r-- | spec/javascripts/vue_mr_widget/mr_widget_options_spec.js | 7 |
1 files changed, 3 insertions, 4 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 425dff89439..3a0c50b750f 100644 --- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js +++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js @@ -48,13 +48,12 @@ describe('mrWidgetOptions', () => { }); describe('shouldRenderMergeHelp', () => { - it('should return false after merging', () => { - vm.mr.isMerged = true; + it('should return false for the initial merged state', () => { expect(vm.shouldRenderMergeHelp).toBeFalsy(); }); - it('should return true before merging', () => { - vm.mr.isMerged = false; + it('should return true for a state which requires help widget', () => { + vm.mr.state = 'conflicts'; expect(vm.shouldRenderMergeHelp).toBeTruthy(); }); }); |