diff options
author | Phil Hughes <me@iamphill.com> | 2018-03-20 14:16:38 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-03-20 14:16:38 +0000 |
commit | af22ddafe4e580850e183993ae276b1f0f565ca6 (patch) | |
tree | 61cb2d55e15e8f57f49a48161835216f4e099755 /spec/javascripts/ide/stores/actions | |
parent | f527e6e1855f30cf5ca5cb834b2d20438299a70e (diff) | |
download | gitlab-ce-af22ddafe4e580850e183993ae276b1f0f565ca6.tar.gz |
updated file references in specs
Diffstat (limited to 'spec/javascripts/ide/stores/actions')
-rw-r--r-- | spec/javascripts/ide/stores/actions/file_spec.js | 8 | ||||
-rw-r--r-- | spec/javascripts/ide/stores/actions/tree_spec.js | 125 |
2 files changed, 80 insertions, 53 deletions
diff --git a/spec/javascripts/ide/stores/actions/file_spec.js b/spec/javascripts/ide/stores/actions/file_spec.js index 55563e29d7f..5b7c8365641 100644 --- a/spec/javascripts/ide/stores/actions/file_spec.js +++ b/spec/javascripts/ide/stores/actions/file_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; -import store from 'ee/ide/stores'; -import service from 'ee/ide/services'; -import router from 'ee/ide/ide_router'; -import eventHub from 'ee/ide/eventhub'; +import store from '~/ide/stores'; +import service from '~/ide/services'; +import router from '~/ide/ide_router'; +import eventHub from '~/ide/eventhub'; import { file, resetStore } from '../../helpers'; describe('Multi-file store file actions', () => { diff --git a/spec/javascripts/ide/stores/actions/tree_spec.js b/spec/javascripts/ide/stores/actions/tree_spec.js index dba4bc10f9d..381f038067b 100644 --- a/spec/javascripts/ide/stores/actions/tree_spec.js +++ b/spec/javascripts/ide/stores/actions/tree_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; -import store from 'ee/ide/stores'; -import service from 'ee/ide/services'; -import router from 'ee/ide/ide_router'; +import store from '~/ide/stores'; +import service from '~/ide/services'; +import router from '~/ide/ide_router'; import { file, resetStore } from '../../helpers'; describe('Multi-file store tree actions', () => { @@ -35,26 +35,32 @@ describe('Multi-file store tree actions', () => { describe('getFiles', () => { beforeEach(() => { - spyOn(service, 'getFiles').and.returnValue(Promise.resolve({ - json: () => Promise.resolve([ - 'file.txt', - 'folder/fileinfolder.js', - 'folder/subfolder/fileinsubfolder.js', - ]), - })); + spyOn(service, 'getFiles').and.returnValue( + Promise.resolve({ + json: () => + Promise.resolve([ + 'file.txt', + 'folder/fileinfolder.js', + 'folder/subfolder/fileinsubfolder.js', + ]), + }), + ); }); - it('calls service getFiles', (done) => { - store.dispatch('getFiles', basicCallParameters) - .then(() => { - expect(service.getFiles).toHaveBeenCalledWith('', 'master'); + it('calls service getFiles', done => { + store + .dispatch('getFiles', basicCallParameters) + .then(() => { + expect(service.getFiles).toHaveBeenCalledWith('', 'master'); - done(); - }).catch(done.fail); + done(); + }) + .catch(done.fail); }); - it('adds data into tree', (done) => { - store.dispatch('getFiles', basicCallParameters) + it('adds data into tree', done => { + store + .dispatch('getFiles', basicCallParameters) .then(() => { projectTree = store.state.trees['abcproject/master']; expect(projectTree.tree.length).toBe(2); @@ -62,10 +68,13 @@ describe('Multi-file store tree actions', () => { expect(projectTree.tree[0].tree[1].name).toBe('fileinfolder.js'); expect(projectTree.tree[1].type).toBe('blob'); expect(projectTree.tree[0].tree[0].tree[0].type).toBe('blob'); - expect(projectTree.tree[0].tree[0].tree[0].name).toBe('fileinsubfolder.js'); + expect(projectTree.tree[0].tree[0].tree[0].name).toBe( + 'fileinsubfolder.js', + ); done(); - }).catch(done.fail); + }) + .catch(done.fail); }); }); @@ -77,30 +86,38 @@ describe('Multi-file store tree actions', () => { store.state.entries[tree.path] = tree; }); - it('toggles the tree open', (done) => { - store.dispatch('toggleTreeOpen', tree.path).then(() => { - expect(tree.opened).toBeTruthy(); + it('toggles the tree open', done => { + store + .dispatch('toggleTreeOpen', tree.path) + .then(() => { + expect(tree.opened).toBeTruthy(); - done(); - }).catch(done.fail); + done(); + }) + .catch(done.fail); }); }); describe('getLastCommitData', () => { beforeEach(() => { - spyOn(service, 'getTreeLastCommit').and.returnValue(Promise.resolve({ - headers: { - 'more-logs-url': null, - }, - json: () => Promise.resolve([{ - type: 'tree', - file_name: 'testing', - commit: { - message: 'commit message', - authored_date: '123', + spyOn(service, 'getTreeLastCommit').and.returnValue( + Promise.resolve({ + headers: { + 'more-logs-url': null, }, - }]), - })); + json: () => + Promise.resolve([ + { + type: 'tree', + file_name: 'testing', + commit: { + message: 'commit message', + authored_date: '123', + }, + }, + ]), + }), + ); store.state.trees['abcproject/mybranch'] = { tree: [], @@ -111,35 +128,45 @@ describe('Multi-file store tree actions', () => { projectTree.lastCommitPath = 'lastcommitpath'; }); - it('calls service with lastCommitPath', (done) => { - store.dispatch('getLastCommitData', projectTree) + it('calls service with lastCommitPath', done => { + store + .dispatch('getLastCommitData', projectTree) .then(() => { - expect(service.getTreeLastCommit).toHaveBeenCalledWith('lastcommitpath'); + expect(service.getTreeLastCommit).toHaveBeenCalledWith( + 'lastcommitpath', + ); done(); - }).catch(done.fail); + }) + .catch(done.fail); }); - it('updates trees last commit data', (done) => { - store.dispatch('getLastCommitData', projectTree) - .then(Vue.nextTick) + it('updates trees last commit data', done => { + store + .dispatch('getLastCommitData', projectTree) + .then(Vue.nextTick) .then(() => { expect(projectTree.tree[0].lastCommit.message).toBe('commit message'); done(); - }).catch(done.fail); + }) + .catch(done.fail); }); - it('does not update entry if not found', (done) => { + it('does not update entry if not found', done => { projectTree.tree[0].name = 'a'; - store.dispatch('getLastCommitData', projectTree) + store + .dispatch('getLastCommitData', projectTree) .then(Vue.nextTick) .then(() => { - expect(projectTree.tree[0].lastCommit.message).not.toBe('commit message'); + expect(projectTree.tree[0].lastCommit.message).not.toBe( + 'commit message', + ); done(); - }).catch(done.fail); + }) + .catch(done.fail); }); }); }); |