2018-03-20 10:16:38 -04:00
|
|
|
import * as utils from '~/ide/stores/utils';
|
2019-04-24 04:45:03 -04:00
|
|
|
import { commitActionTypes } from '~/ide/constants';
|
2018-06-07 12:19:35 -04:00
|
|
|
import { file } from '../helpers';
|
2018-03-20 10:12:48 -04:00
|
|
|
|
|
|
|
describe('Multi-file store utils', () => {
|
|
|
|
describe('setPageTitle', () => {
|
|
|
|
it('sets the document page title', () => {
|
|
|
|
utils.setPageTitle('test');
|
|
|
|
|
|
|
|
expect(document.title).toBe('test');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('findIndexOfFile', () => {
|
|
|
|
let localState;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
2018-03-20 10:16:38 -04:00
|
|
|
localState = [
|
|
|
|
{
|
|
|
|
path: '1',
|
|
|
|
},
|
|
|
|
{
|
|
|
|
path: '2',
|
|
|
|
},
|
|
|
|
];
|
2018-03-20 10:12:48 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
it('finds in the index of an entry by path', () => {
|
|
|
|
const index = utils.findIndexOfFile(localState, {
|
|
|
|
path: '2',
|
|
|
|
});
|
|
|
|
|
|
|
|
expect(index).toBe(1);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('findEntry', () => {
|
|
|
|
let localState;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
localState = {
|
2018-03-20 10:16:38 -04:00
|
|
|
tree: [
|
|
|
|
{
|
|
|
|
type: 'tree',
|
|
|
|
name: 'test',
|
|
|
|
},
|
|
|
|
{
|
|
|
|
type: 'blob',
|
|
|
|
name: 'file',
|
|
|
|
},
|
|
|
|
],
|
2018-03-20 10:12:48 -04:00
|
|
|
};
|
|
|
|
});
|
|
|
|
|
|
|
|
it('returns an entry found by name', () => {
|
|
|
|
const foundEntry = utils.findEntry(localState.tree, 'tree', 'test');
|
|
|
|
|
|
|
|
expect(foundEntry.type).toBe('tree');
|
|
|
|
expect(foundEntry.name).toBe('test');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('returns undefined when no entry found', () => {
|
|
|
|
const foundEntry = utils.findEntry(localState.tree, 'blob', 'test');
|
|
|
|
|
|
|
|
expect(foundEntry).toBeUndefined();
|
|
|
|
});
|
|
|
|
});
|
2018-06-07 12:19:35 -04:00
|
|
|
|
|
|
|
describe('createCommitPayload', () => {
|
|
|
|
it('returns API payload', () => {
|
|
|
|
const state = {
|
|
|
|
commitMessage: 'commit message',
|
|
|
|
};
|
|
|
|
const rootState = {
|
|
|
|
stagedFiles: [
|
|
|
|
{
|
|
|
|
...file('staged'),
|
|
|
|
path: 'staged',
|
|
|
|
content: 'updated file content',
|
2018-06-15 06:12:13 -04:00
|
|
|
lastCommitSha: '123456789',
|
2018-06-07 12:19:35 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
...file('newFile'),
|
|
|
|
path: 'added',
|
|
|
|
tempFile: true,
|
|
|
|
content: 'new file content',
|
|
|
|
base64: true,
|
2018-06-15 06:12:13 -04:00
|
|
|
lastCommitSha: '123456789',
|
2018-06-07 12:19:35 -04:00
|
|
|
},
|
2018-07-26 10:56:56 -04:00
|
|
|
{
|
|
|
|
...file('deletedFile'),
|
|
|
|
path: 'deletedFile',
|
|
|
|
deleted: true,
|
|
|
|
},
|
2018-06-07 12:19:35 -04:00
|
|
|
],
|
|
|
|
currentBranchId: 'master',
|
|
|
|
};
|
|
|
|
const payload = utils.createCommitPayload({
|
|
|
|
branch: 'master',
|
|
|
|
newBranch: false,
|
|
|
|
state,
|
|
|
|
rootState,
|
2018-06-25 09:51:45 -04:00
|
|
|
getters: {},
|
2018-06-07 12:19:35 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
expect(payload).toEqual({
|
|
|
|
branch: 'master',
|
|
|
|
commit_message: 'commit message',
|
|
|
|
actions: [
|
|
|
|
{
|
2019-04-24 04:45:03 -04:00
|
|
|
action: commitActionTypes.update,
|
2018-06-07 12:19:35 -04:00
|
|
|
file_path: 'staged',
|
|
|
|
content: 'updated file content',
|
|
|
|
encoding: 'text',
|
|
|
|
last_commit_id: '123456789',
|
2018-07-30 12:35:56 -04:00
|
|
|
previous_path: undefined,
|
2018-06-07 12:19:35 -04:00
|
|
|
},
|
|
|
|
{
|
2019-04-24 04:45:03 -04:00
|
|
|
action: commitActionTypes.create,
|
2018-06-07 12:19:35 -04:00
|
|
|
file_path: 'added',
|
|
|
|
content: 'new file content',
|
|
|
|
encoding: 'base64',
|
|
|
|
last_commit_id: '123456789',
|
2018-07-30 12:35:56 -04:00
|
|
|
previous_path: undefined,
|
2018-06-07 12:19:35 -04:00
|
|
|
},
|
2018-07-26 10:56:56 -04:00
|
|
|
{
|
2019-04-24 04:45:03 -04:00
|
|
|
action: commitActionTypes.delete,
|
2018-07-26 10:56:56 -04:00
|
|
|
file_path: 'deletedFile',
|
2018-08-02 09:28:44 -04:00
|
|
|
content: undefined,
|
2018-07-26 10:56:56 -04:00
|
|
|
encoding: 'text',
|
|
|
|
last_commit_id: undefined,
|
2018-07-30 12:35:56 -04:00
|
|
|
previous_path: undefined,
|
2018-07-26 10:56:56 -04:00
|
|
|
},
|
2018-06-07 12:19:35 -04:00
|
|
|
],
|
|
|
|
start_branch: undefined,
|
|
|
|
});
|
|
|
|
});
|
2018-06-25 09:51:45 -04:00
|
|
|
|
|
|
|
it('uses prebuilt commit message when commit message is empty', () => {
|
|
|
|
const rootState = {
|
|
|
|
stagedFiles: [
|
|
|
|
{
|
|
|
|
...file('staged'),
|
|
|
|
path: 'staged',
|
|
|
|
content: 'updated file content',
|
|
|
|
lastCommitSha: '123456789',
|
|
|
|
},
|
|
|
|
{
|
|
|
|
...file('newFile'),
|
|
|
|
path: 'added',
|
|
|
|
tempFile: true,
|
|
|
|
content: 'new file content',
|
|
|
|
base64: true,
|
|
|
|
lastCommitSha: '123456789',
|
|
|
|
},
|
|
|
|
],
|
|
|
|
currentBranchId: 'master',
|
|
|
|
};
|
|
|
|
const payload = utils.createCommitPayload({
|
|
|
|
branch: 'master',
|
|
|
|
newBranch: false,
|
|
|
|
state: {},
|
|
|
|
rootState,
|
|
|
|
getters: {
|
|
|
|
preBuiltCommitMessage: 'prebuilt test commit message',
|
|
|
|
},
|
|
|
|
});
|
|
|
|
|
|
|
|
expect(payload).toEqual({
|
|
|
|
branch: 'master',
|
|
|
|
commit_message: 'prebuilt test commit message',
|
|
|
|
actions: [
|
|
|
|
{
|
2019-04-24 04:45:03 -04:00
|
|
|
action: commitActionTypes.update,
|
2018-06-25 09:51:45 -04:00
|
|
|
file_path: 'staged',
|
|
|
|
content: 'updated file content',
|
|
|
|
encoding: 'text',
|
|
|
|
last_commit_id: '123456789',
|
2018-07-30 12:35:56 -04:00
|
|
|
previous_path: undefined,
|
2018-06-25 09:51:45 -04:00
|
|
|
},
|
|
|
|
{
|
2019-04-24 04:45:03 -04:00
|
|
|
action: commitActionTypes.create,
|
2018-06-25 09:51:45 -04:00
|
|
|
file_path: 'added',
|
|
|
|
content: 'new file content',
|
|
|
|
encoding: 'base64',
|
|
|
|
last_commit_id: '123456789',
|
2018-07-30 12:35:56 -04:00
|
|
|
previous_path: undefined,
|
2018-06-25 09:51:45 -04:00
|
|
|
},
|
|
|
|
],
|
|
|
|
start_branch: undefined,
|
|
|
|
});
|
|
|
|
});
|
2018-06-07 12:19:35 -04:00
|
|
|
});
|
2018-07-26 10:56:56 -04:00
|
|
|
|
|
|
|
describe('commitActionForFile', () => {
|
|
|
|
it('returns deleted for deleted file', () => {
|
2019-04-24 04:45:03 -04:00
|
|
|
expect(utils.commitActionForFile({ deleted: true })).toBe(commitActionTypes.delete);
|
2018-07-26 10:56:56 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
it('returns create for tempFile', () => {
|
2019-04-24 04:45:03 -04:00
|
|
|
expect(utils.commitActionForFile({ tempFile: true })).toBe(commitActionTypes.create);
|
2018-07-26 10:56:56 -04:00
|
|
|
});
|
|
|
|
|
2018-07-30 12:35:56 -04:00
|
|
|
it('returns move for moved file', () => {
|
2019-04-24 04:45:03 -04:00
|
|
|
expect(utils.commitActionForFile({ prevPath: 'test' })).toBe(commitActionTypes.move);
|
2018-07-30 12:35:56 -04:00
|
|
|
});
|
|
|
|
|
2018-07-26 10:56:56 -04:00
|
|
|
it('returns update by default', () => {
|
2019-04-24 04:45:03 -04:00
|
|
|
expect(utils.commitActionForFile({})).toBe(commitActionTypes.update);
|
2018-07-26 10:56:56 -04:00
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('getCommitFiles', () => {
|
2018-08-02 09:28:44 -04:00
|
|
|
it('returns list of files excluding moved files', () => {
|
2018-07-26 10:56:56 -04:00
|
|
|
const files = [
|
|
|
|
{
|
|
|
|
path: 'a',
|
|
|
|
type: 'blob',
|
|
|
|
deleted: true,
|
|
|
|
},
|
2018-07-31 04:18:24 -04:00
|
|
|
{
|
|
|
|
path: 'c',
|
2018-08-02 09:28:44 -04:00
|
|
|
type: 'blob',
|
|
|
|
moved: true,
|
2018-07-31 04:18:24 -04:00
|
|
|
},
|
2018-07-26 10:56:56 -04:00
|
|
|
];
|
|
|
|
|
|
|
|
const flattendFiles = utils.getCommitFiles(files);
|
|
|
|
|
|
|
|
expect(flattendFiles).toEqual([
|
|
|
|
{
|
|
|
|
path: 'a',
|
|
|
|
type: 'blob',
|
|
|
|
deleted: true,
|
|
|
|
},
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
});
|
2019-03-26 12:28:33 -04:00
|
|
|
|
|
|
|
describe('mergeTrees', () => {
|
|
|
|
let fromTree;
|
|
|
|
let toTree;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
fromTree = [file('foo')];
|
|
|
|
toTree = [file('bar')];
|
|
|
|
});
|
|
|
|
|
|
|
|
it('merges simple trees with sorting the result', () => {
|
|
|
|
toTree = [file('beta'), file('alpha'), file('gamma')];
|
|
|
|
const res = utils.mergeTrees(fromTree, toTree);
|
|
|
|
|
|
|
|
expect(res.length).toEqual(4);
|
|
|
|
expect(res[0].name).toEqual('alpha');
|
|
|
|
expect(res[1].name).toEqual('beta');
|
|
|
|
expect(res[2].name).toEqual('foo');
|
|
|
|
expect(res[3].name).toEqual('gamma');
|
|
|
|
expect(res[2]).toBe(fromTree[0]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('handles edge cases', () => {
|
|
|
|
expect(utils.mergeTrees({}, []).length).toEqual(0);
|
|
|
|
|
|
|
|
let res = utils.mergeTrees({}, toTree);
|
|
|
|
|
|
|
|
expect(res.length).toEqual(1);
|
|
|
|
expect(res[0].name).toEqual('bar');
|
|
|
|
|
|
|
|
res = utils.mergeTrees(fromTree, []);
|
|
|
|
|
|
|
|
expect(res.length).toEqual(1);
|
|
|
|
expect(res[0].name).toEqual('foo');
|
|
|
|
expect(res[0]).toBe(fromTree[0]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('merges simple trees without producing duplicates', () => {
|
|
|
|
toTree.push(file('foo'));
|
|
|
|
|
|
|
|
const res = utils.mergeTrees(fromTree, toTree);
|
|
|
|
|
|
|
|
expect(res.length).toEqual(2);
|
|
|
|
expect(res[0].name).toEqual('bar');
|
|
|
|
expect(res[1].name).toEqual('foo');
|
|
|
|
expect(res[1]).not.toBe(fromTree[0]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('merges nested tree into the main one without duplicates', () => {
|
|
|
|
fromTree[0].tree.push({
|
|
|
|
...file('alpha'),
|
|
|
|
path: 'foo/alpha',
|
|
|
|
tree: [
|
|
|
|
{
|
|
|
|
...file('beta.md'),
|
|
|
|
path: 'foo/alpha/beta.md',
|
|
|
|
},
|
|
|
|
],
|
|
|
|
});
|
|
|
|
|
|
|
|
toTree.push({
|
|
|
|
...file('foo'),
|
|
|
|
tree: [
|
|
|
|
{
|
|
|
|
...file('alpha'),
|
|
|
|
path: 'foo/alpha',
|
|
|
|
tree: [
|
|
|
|
{
|
|
|
|
...file('gamma.md'),
|
|
|
|
path: 'foo/alpha/gamma.md',
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
],
|
|
|
|
});
|
|
|
|
|
|
|
|
const res = utils.mergeTrees(fromTree, toTree);
|
|
|
|
|
|
|
|
expect(res.length).toEqual(2);
|
|
|
|
expect(res[1].name).toEqual('foo');
|
|
|
|
|
|
|
|
const finalBranch = res[1].tree[0].tree;
|
|
|
|
|
|
|
|
expect(finalBranch.length).toEqual(2);
|
|
|
|
expect(finalBranch[0].name).toEqual('beta.md');
|
|
|
|
expect(finalBranch[1].name).toEqual('gamma.md');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('marks correct folders as opened as the parsing goes on', () => {
|
|
|
|
fromTree[0].tree.push({
|
|
|
|
...file('alpha'),
|
|
|
|
path: 'foo/alpha',
|
|
|
|
tree: [
|
|
|
|
{
|
|
|
|
...file('beta.md'),
|
|
|
|
path: 'foo/alpha/beta.md',
|
|
|
|
},
|
|
|
|
],
|
|
|
|
});
|
|
|
|
|
|
|
|
toTree.push({
|
|
|
|
...file('foo'),
|
|
|
|
tree: [
|
|
|
|
{
|
|
|
|
...file('alpha'),
|
|
|
|
path: 'foo/alpha',
|
|
|
|
tree: [
|
|
|
|
{
|
|
|
|
...file('gamma.md'),
|
|
|
|
path: 'foo/alpha/gamma.md',
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
],
|
|
|
|
});
|
|
|
|
|
|
|
|
const res = utils.mergeTrees(fromTree, toTree);
|
|
|
|
|
|
|
|
expect(res[1].name).toEqual('foo');
|
|
|
|
expect(res[1].opened).toEqual(true);
|
|
|
|
|
|
|
|
expect(res[1].tree[0].name).toEqual('alpha');
|
|
|
|
expect(res[1].tree[0].opened).toEqual(true);
|
|
|
|
});
|
|
|
|
});
|
2018-03-20 10:12:48 -04:00
|
|
|
});
|