karma fixes
This commit is contained in:
parent
3c62b51ce9
commit
fd3ef2eb88
6 changed files with 15 additions and 4 deletions
|
@ -109,7 +109,7 @@ export const setPageTitle = title => {
|
|||
};
|
||||
|
||||
export const commitActionForFile = file => {
|
||||
if (file.prevPath !== '') {
|
||||
if (file.prevPath) {
|
||||
return 'move';
|
||||
} else if (file.deleted) {
|
||||
return 'delete';
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
title: Enable renaming files and folders in Web IDE
|
||||
merge_request:
|
||||
merge_request: 20835
|
||||
author:
|
||||
type: added
|
||||
|
|
|
@ -73,7 +73,7 @@ describe('new dropdown component', () => {
|
|||
it('calls delete action', () => {
|
||||
spyOn(vm, 'deleteEntry');
|
||||
|
||||
vm.$el.querySelectorAll('.dropdown-menu button')[3].click();
|
||||
vm.$el.querySelectorAll('.dropdown-menu button')[4].click();
|
||||
|
||||
expect(vm.deleteEntry).toHaveBeenCalledWith('');
|
||||
});
|
||||
|
|
|
@ -45,7 +45,7 @@ describe('new file modal component', () => {
|
|||
it('$emits create', () => {
|
||||
spyOn(vm, 'createTempEntry');
|
||||
|
||||
vm.createEntryInStore();
|
||||
vm.submitForm();
|
||||
|
||||
expect(vm.createTempEntry).toHaveBeenCalledWith({
|
||||
name: 'testing',
|
||||
|
|
|
@ -297,6 +297,7 @@ describe('IDE commit module actions', () => {
|
|||
content: jasmine.anything(),
|
||||
encoding: jasmine.anything(),
|
||||
last_commit_id: undefined,
|
||||
previous_path: undefined,
|
||||
},
|
||||
],
|
||||
start_branch: 'master',
|
||||
|
@ -323,6 +324,7 @@ describe('IDE commit module actions', () => {
|
|||
content: jasmine.anything(),
|
||||
encoding: jasmine.anything(),
|
||||
last_commit_id: '123456789',
|
||||
previous_path: undefined,
|
||||
},
|
||||
],
|
||||
start_branch: undefined,
|
||||
|
|
|
@ -112,6 +112,7 @@ describe('Multi-file store utils', () => {
|
|||
content: 'updated file content',
|
||||
encoding: 'text',
|
||||
last_commit_id: '123456789',
|
||||
previous_path: undefined,
|
||||
},
|
||||
{
|
||||
action: 'create',
|
||||
|
@ -119,6 +120,7 @@ describe('Multi-file store utils', () => {
|
|||
content: 'new file content',
|
||||
encoding: 'base64',
|
||||
last_commit_id: '123456789',
|
||||
previous_path: undefined,
|
||||
},
|
||||
{
|
||||
action: 'delete',
|
||||
|
@ -126,6 +128,7 @@ describe('Multi-file store utils', () => {
|
|||
content: '',
|
||||
encoding: 'text',
|
||||
last_commit_id: undefined,
|
||||
previous_path: undefined,
|
||||
},
|
||||
],
|
||||
start_branch: undefined,
|
||||
|
@ -172,6 +175,7 @@ describe('Multi-file store utils', () => {
|
|||
content: 'updated file content',
|
||||
encoding: 'text',
|
||||
last_commit_id: '123456789',
|
||||
previous_path: undefined,
|
||||
},
|
||||
{
|
||||
action: 'create',
|
||||
|
@ -179,6 +183,7 @@ describe('Multi-file store utils', () => {
|
|||
content: 'new file content',
|
||||
encoding: 'base64',
|
||||
last_commit_id: '123456789',
|
||||
previous_path: undefined,
|
||||
},
|
||||
],
|
||||
start_branch: undefined,
|
||||
|
@ -195,6 +200,10 @@ describe('Multi-file store utils', () => {
|
|||
expect(utils.commitActionForFile({ tempFile: true })).toBe('create');
|
||||
});
|
||||
|
||||
it('returns move for moved file', () => {
|
||||
expect(utils.commitActionForFile({ prevPath: 'test' })).toBe('move');
|
||||
});
|
||||
|
||||
it('returns update by default', () => {
|
||||
expect(utils.commitActionForFile({})).toBe('update');
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue