diff options
author | winh <winnie@gitlab.com> | 2017-06-21 13:46:53 +0300 |
---|---|---|
committer | winh <winnie@gitlab.com> | 2017-06-21 13:46:53 +0300 |
commit | ac1e0f350335303439cdf721035527a88aabf0b4 (patch) | |
tree | 973372dbdec16b0ac80a53ff1e8d63812db49cb7 /spec | |
parent | 120e4ad3654b5a504ebfaf81c0227d73a49cf03d (diff) |
fix merge request widget33999-mr-widget-does-not-load-in-9-3-rc5
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/vue_mr_widget/mr_widget_options_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js | 12 |
2 files changed, 2 insertions, 12 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..4145d2ad096 100644 --- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js +++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js @@ -49,11 +49,13 @@ describe('mrWidgetOptions', () => { describe('shouldRenderMergeHelp', () => { it('should return false after merging', () => { + fail('TODO'); vm.mr.isMerged = true; expect(vm.shouldRenderMergeHelp).toBeFalsy(); }); it('should return true before merging', () => { + fail('TODO'); vm.mr.isMerged = false; expect(vm.shouldRenderMergeHelp).toBeTruthy(); }); diff --git a/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js b/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js index 71285866302..56dd0198ae2 100644 --- a/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js +++ b/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js @@ -18,17 +18,5 @@ describe('MergeRequestStore', () => { store.setData({ ...mockData, work_in_progress: !mockData.work_in_progress }); expect(store.hasSHAChanged).toBe(false); }); - - it('sets isMerged to true for merged state', () => { - store.setData({ ...mockData, state: 'merged' }); - - expect(store.isMerged).toBe(true); - }); - - it('sets isMerged to false for readyToMerge state', () => { - store.setData({ ...mockData, state: 'readyToMerge' }); - - expect(store.isMerged).toBe(false); - }); }); }); |