diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 13:43:06 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 13:43:06 -0500 |
commit | cefeeaea3364c52afc8077c6eaa8914a4bb27852 (patch) | |
tree | 03c1100e2636510f89982b4a3473e868a3745eab /spec/javascripts/ide/components/commit_sidebar/list_item_spec.js | |
parent | 59d6161e1ea5f4650fe45a0f6bd2e45bb061f6e1 (diff) | |
parent | b1e9d98a29605daf7ccdd0e324dd399fdebfee41 (diff) | |
download | gitlab-ce-cefeeaea3364c52afc8077c6eaa8914a4bb27852.tar.gz |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'spec/javascripts/ide/components/commit_sidebar/list_item_spec.js')
-rw-r--r-- | spec/javascripts/ide/components/commit_sidebar/list_item_spec.js | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/spec/javascripts/ide/components/commit_sidebar/list_item_spec.js b/spec/javascripts/ide/components/commit_sidebar/list_item_spec.js index 509434e4300..cc7e0a3f26d 100644 --- a/spec/javascripts/ide/components/commit_sidebar/list_item_spec.js +++ b/spec/javascripts/ide/components/commit_sidebar/list_item_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; +import store from '~/ide/stores'; import listItem from '~/ide/components/commit_sidebar/list_item.vue'; import router from '~/ide/ide_router'; -import store from '~/ide/stores'; import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { file, resetStore } from '../../helpers'; @@ -18,6 +18,7 @@ describe('Multi-file editor commit sidebar list item', () => { vm = createComponentWithStore(Component, store, { file: f, + actionComponent: 'stage-button', }).$mount(); }); @@ -31,22 +32,18 @@ describe('Multi-file editor commit sidebar list item', () => { expect(vm.$el.querySelector('.multi-file-commit-list-path').textContent.trim()).toBe(f.path); }); - it('calls discardFileChanges when clicking discard button', () => { - spyOn(vm, 'discardFileChanges'); - - vm.$el.querySelector('.multi-file-discard-btn').click(); - - expect(vm.discardFileChanges).toHaveBeenCalled(); + it('renders actionn button', () => { + expect(vm.$el.querySelector('.multi-file-discard-btn')).not.toBeNull(); }); it('opens a closed file in the editor when clicking the file path', done => { - spyOn(vm, 'openFileInEditor').and.callThrough(); + spyOn(vm, 'openPendingTab').and.callThrough(); spyOn(router, 'push'); vm.$el.querySelector('.multi-file-commit-list-path').click(); setTimeout(() => { - expect(vm.openFileInEditor).toHaveBeenCalled(); + expect(vm.openPendingTab).toHaveBeenCalled(); expect(router.push).toHaveBeenCalled(); done(); |