diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /spec/javascripts/ide/components/repo_editor_spec.js | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'spec/javascripts/ide/components/repo_editor_spec.js')
-rw-r--r-- | spec/javascripts/ide/components/repo_editor_spec.js | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/spec/javascripts/ide/components/repo_editor_spec.js b/spec/javascripts/ide/components/repo_editor_spec.js index ef0299f0d56..8db29011da7 100644 --- a/spec/javascripts/ide/components/repo_editor_spec.js +++ b/spec/javascripts/ide/components/repo_editor_spec.js @@ -26,7 +26,23 @@ describe('RepoEditor', () => { f.active = true; f.tempFile = true; + vm.$store.state.openFiles.push(f); + vm.$store.state.projects = { + 'gitlab-org/gitlab': { + branches: { + master: { + name: 'master', + commit: { + id: 'abcdefgh', + }, + }, + }, + }, + }; + vm.$store.state.currentProjectId = 'gitlab-org/gitlab'; + vm.$store.state.currentBranchId = 'master'; + Vue.set(vm.$store.state.entries, f.path, f); spyOn(vm, 'getFileData').and.returnValue(Promise.resolve()); @@ -46,11 +62,6 @@ describe('RepoEditor', () => { }); const findEditor = () => vm.$el.querySelector('.multi-file-editor-holder'); - const changeRightPanelCollapsed = () => { - const { state } = vm.$store; - - state.rightPanelCollapsed = !state.rightPanelCollapsed; - }; it('sets renderWhitespace to `all`', () => { vm.$store.state.renderWhitespaceInCode = true; @@ -303,17 +314,6 @@ describe('RepoEditor', () => { spyOn(vm.editor, 'updateDiffView'); }); - it('calls updateDimensions when rightPanelCollapsed is changed', done => { - changeRightPanelCollapsed(); - - vm.$nextTick(() => { - expect(vm.editor.updateDimensions).toHaveBeenCalled(); - expect(vm.editor.updateDiffView).toHaveBeenCalled(); - - done(); - }); - }); - it('calls updateDimensions when panelResizing is false', done => { vm.$store.state.panelResizing = true; @@ -391,17 +391,6 @@ describe('RepoEditor', () => { expect(findEditor()).toHaveCss({ display: 'none' }); }); - it('should not update dimensions', done => { - changeRightPanelCollapsed(); - - vm.$nextTick() - .then(() => { - expect(vm.editor.updateDimensions).not.toHaveBeenCalled(); - }) - .then(done) - .catch(done.fail); - }); - describe('when file view mode changes to editor', () => { beforeEach(done => { vm.file.viewMode = FILE_VIEW_MODE_EDITOR; |