kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ide-create-commit-action-types-constant' into 'master' 

Create constants for IDE commit action values

See merge request gitlab-org/gitlab-ce!27613
This commit is contained in:
Phil Hughes 2019-04-24 10:15:04 +00:00
parent bb8d8ad93e 218430bdde
commit d056d9d4b7
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/ide/constants.js
View File

@ -72,4 +72,11 @@ export const modalTypes = {
tree: 'tree',
};
export const commitActionTypes = {
move: 'move',
delete: 'delete',
create: 'create',
update: 'update',
};
export const packageJsonPath = 'package.json';

10
app/assets/javascripts/ide/stores/utils.js
View File

@ -1,3 +1,5 @@
import { commitActionTypes } from '../constants';
export const dataStructure = () => ({
id: '',
// Key will contain a mixture of ID and path
@ -114,14 +116,14 @@ export const setPageTitle = title => {
export const commitActionForFile = file => {
if (file.prevPath) {
return 'move';
return commitActionTypes.move;
} else if (file.deleted) {
return 'delete';
return commitActionTypes.delete;
} else if (file.tempFile) {
return 'create';
return commitActionTypes.create;
}
return 'update';
return commitActionTypes.update;
};
export const getCommitFiles = stagedFiles =>

5
spec/javascripts/ide/stores/modules/commit/actions_spec.js
View File

@ -4,6 +4,7 @@ import service from '~/ide/services';
import router from '~/ide/ide_router';
import eventHub from '~/ide/eventhub';
import consts from '~/ide/stores/modules/commit/constants';
import { commitActionTypes } from '~/ide/constants';
import { resetStore, file } from 'spec/ide/helpers';
describe('IDE commit module actions', () => {
@ -294,7 +295,7 @@ describe('IDE commit module actions', () => {
commit_message: 'testing 123',
actions: [
{
action: 'update',
action: commitActionTypes.update,
file_path: jasmine.anything(),
content: undefined,
encoding: jasmine.anything(),
@ -321,7 +322,7 @@ describe('IDE commit module actions', () => {
commit_message: 'testing 123',
actions: [
{
action: 'update',
action: commitActionTypes.update,
file_path: jasmine.anything(),
content: undefined,
encoding: jasmine.anything(),

19
spec/javascripts/ide/stores/utils_spec.js
View File

@ -1,4 +1,5 @@
import * as utils from '~/ide/stores/utils';
import { commitActionTypes } from '~/ide/constants';
import { file } from '../helpers';
describe('Multi-file store utils', () => {
@ -107,7 +108,7 @@ describe('Multi-file store utils', () => {
commit_message: 'commit message',
actions: [
{
action: 'update',
action: commitActionTypes.update,
file_path: 'staged',
content: 'updated file content',
encoding: 'text',
@ -115,7 +116,7 @@ describe('Multi-file store utils', () => {
previous_path: undefined,
},
{
action: 'create',
action: commitActionTypes.create,
file_path: 'added',
content: 'new file content',
encoding: 'base64',
@ -123,7 +124,7 @@ describe('Multi-file store utils', () => {
previous_path: undefined,
},
{
action: 'delete',
action: commitActionTypes.delete,
file_path: 'deletedFile',
content: undefined,
encoding: 'text',
@ -170,7 +171,7 @@ describe('Multi-file store utils', () => {
commit_message: 'prebuilt test commit message',
actions: [
{
action: 'update',
action: commitActionTypes.update,
file_path: 'staged',
content: 'updated file content',
encoding: 'text',
@ -178,7 +179,7 @@ describe('Multi-file store utils', () => {
previous_path: undefined,
},
{
action: 'create',
action: commitActionTypes.create,
file_path: 'added',
content: 'new file content',
encoding: 'base64',
@ -193,19 +194,19 @@ describe('Multi-file store utils', () => {
describe('commitActionForFile', () => {
it('returns deleted for deleted file', () => {
expect(utils.commitActionForFile({ deleted: true })).toBe('delete');
expect(utils.commitActionForFile({ deleted: true })).toBe(commitActionTypes.delete);
});
it('returns create for tempFile', () => {
expect(utils.commitActionForFile({ tempFile: true })).toBe('create');
expect(utils.commitActionForFile({ tempFile: true })).toBe(commitActionTypes.create);
});
it('returns move for moved file', () => {
expect(utils.commitActionForFile({ prevPath: 'test' })).toBe('move');
expect(utils.commitActionForFile({ prevPath: 'test' })).toBe(commitActionTypes.move);
});
it('returns update by default', () => {
expect(utils.commitActionForFile({})).toBe('update');
expect(utils.commitActionForFile({})).toBe(commitActionTypes.update);
});
});