Skip to content

Commit

Permalink
Added prettier.
Browse files Browse the repository at this point in the history
  • Loading branch information
robgietema committed Apr 13, 2017
1 parent 732629a commit a663071
Show file tree
Hide file tree
Showing 112 changed files with 1,204 additions and 964 deletions.
6 changes: 6 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"ClassDeclaration": true,
}
}],
"arrow-parens": "off", // Keep compatible with prettier
"no-confusing-arrow": 0, // Keep compatible with prettier
"prettier/prettier": ["error", {"trailingComma": "all", "singleQuote": true}],
},
"globals": {
"root": true,
Expand All @@ -32,4 +35,7 @@
"socket": true,
"webpackIsomorphicTools": true,
},
"plugins": [
"prettier",
],
}
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@
"jsdoc:api": "jsdoc -c jsdoc.api.json; : 'ignore minor errors'",
"lint": "eslint -c .eslintrc src",
"lint:fix": "eslint -c .eslintrc src --fix",
"prettier": "prettier -l --single-quote --trailing-comma all 'src/**/*.js' 'src/**/*.jsx'",
"prettier:fix": "prettier --write -l --single-quote --trailing-comma all 'src/**/*.js' 'src/**/*.jsx'",
"watch:test:unit": "better-npm-run watch_test_unit",
"test": "npm-run-all test:unit",
"test": "npm-run-all prettier lint test:unit",
"test:unit": "better-npm-run test_unit",
"coverage": "npm-run-all test && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"pretest:e2e": "npm-run-all webdriver-update wait-for-frontend",
Expand Down Expand Up @@ -137,6 +139,7 @@
"draft-js-editor": "1.8.14",
"draft-js-export-html": "0.5.2",
"es6-error": "4.0.2",
"eslint-plugin-prettier": "^2.0.1",
"express": "4.15.2",
"express-healthcheck": "0.1.0",
"file-loader": "0.11.1",
Expand All @@ -160,6 +163,7 @@
"npm-run-all": "4.0.2",
"path": "0.12.7",
"piping": "1.0.0-rc.4",
"prettier": "^0.22.0",
"pretty-error": "2.1.0",
"prop-types": "15.5.7",
"react": "15.5.4",
Expand Down
10 changes: 8 additions & 2 deletions src/actions/breadcrumbs/breadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
*/

import {
GET_BREADCRUMBS_PENDING, GET_BREADCRUMBS_SUCCESS, GET_BREADCRUMBS_FAIL,
GET_BREADCRUMBS_PENDING,
GET_BREADCRUMBS_SUCCESS,
GET_BREADCRUMBS_FAIL,
} from '../../constants/ActionTypes';

/**
Expand All @@ -15,7 +17,11 @@ import {
*/
export default function getBreadcrumbs(url) {
return {
types: [GET_BREADCRUMBS_PENDING, GET_BREADCRUMBS_SUCCESS, GET_BREADCRUMBS_FAIL],
types: [
GET_BREADCRUMBS_PENDING,
GET_BREADCRUMBS_SUCCESS,
GET_BREADCRUMBS_FAIL,
],
promise: api => api.get(`${url}/@components/breadcrumbs`),
};
}
4 changes: 3 additions & 1 deletion src/actions/breadcrumbs/breadcrumbs.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import getBreadcrumbs from './breadcrumbs';
import {
GET_BREADCRUMBS_PENDING, GET_BREADCRUMBS_SUCCESS, GET_BREADCRUMBS_FAIL,
GET_BREADCRUMBS_PENDING,
GET_BREADCRUMBS_SUCCESS,
GET_BREADCRUMBS_FAIL,
} from '../../constants/ActionTypes';

describe('Breadcrumbs action', () => {
Expand Down
11 changes: 8 additions & 3 deletions src/actions/clipboard/clipboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@
*/

import {
COPY_PENDING, COPY_SUCCESS, COPY_FAIL,
MOVE_PENDING, MOVE_SUCCESS, MOVE_FAIL,
COPY, CUT,
COPY_PENDING,
COPY_SUCCESS,
COPY_FAIL,
MOVE_PENDING,
MOVE_SUCCESS,
MOVE_FAIL,
COPY,
CUT,
} from '../../constants/ActionTypes';

/**
Expand Down
19 changes: 14 additions & 5 deletions src/actions/clipboard/clipboard.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import { copy, cut, copyContent, moveContent } from './clipboard';
import {
COPY_PENDING, COPY_SUCCESS, COPY_FAIL,
MOVE_PENDING, MOVE_SUCCESS, MOVE_FAIL,
COPY, CUT,
COPY_PENDING,
COPY_SUCCESS,
COPY_FAIL,
MOVE_PENDING,
MOVE_SUCCESS,
MOVE_FAIL,
COPY,
CUT,
} from '../../constants/ActionTypes';

describe('Clipboard action', () => {
Expand All @@ -19,7 +24,9 @@ describe('Clipboard action', () => {
};
action.promise(apiMock);

expect(apiMock.post).toBeCalledWith(`${target}/@copy`, { data: { source } });
expect(apiMock.post).toBeCalledWith(`${target}/@copy`, {
data: { source },
});
});
});

Expand All @@ -36,7 +43,9 @@ describe('Clipboard action', () => {
};
action.promise(apiMock);

expect(apiMock.post).toBeCalledWith(`${target}/@move`, { data: { source } });
expect(apiMock.post).toBeCalledWith(`${target}/@move`, {
data: { source },
});
});
});

Expand Down
22 changes: 17 additions & 5 deletions src/actions/content/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,18 @@
*/

import {
ADD_CONTENT_PENDING, ADD_CONTENT_SUCCESS, ADD_CONTENT_FAIL,
DELETE_CONTENT_PENDING, DELETE_CONTENT_SUCCESS, DELETE_CONTENT_FAIL,
EDIT_CONTENT_PENDING, EDIT_CONTENT_SUCCESS, EDIT_CONTENT_FAIL,
GET_CONTENT_PENDING, GET_CONTENT_SUCCESS, GET_CONTENT_FAIL,
ADD_CONTENT_PENDING,
ADD_CONTENT_SUCCESS,
ADD_CONTENT_FAIL,
DELETE_CONTENT_PENDING,
DELETE_CONTENT_SUCCESS,
DELETE_CONTENT_FAIL,
EDIT_CONTENT_PENDING,
EDIT_CONTENT_SUCCESS,
EDIT_CONTENT_FAIL,
GET_CONTENT_PENDING,
GET_CONTENT_SUCCESS,
GET_CONTENT_FAIL,
} from '../../constants/ActionTypes';

/**
Expand All @@ -32,7 +40,11 @@ export function addContent(url, content) {
*/
export function deleteContent(url) {
return {
types: [DELETE_CONTENT_PENDING, DELETE_CONTENT_SUCCESS, DELETE_CONTENT_FAIL],
types: [
DELETE_CONTENT_PENDING,
DELETE_CONTENT_SUCCESS,
DELETE_CONTENT_FAIL,
],
promise: api => api.del(url),
};
}
Expand Down
34 changes: 27 additions & 7 deletions src/actions/content/content.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
import { addContent, deleteContent, editContent, getContent } from './content';
import {
ADD_CONTENT_PENDING, ADD_CONTENT_SUCCESS, ADD_CONTENT_FAIL,
DELETE_CONTENT_PENDING, DELETE_CONTENT_SUCCESS, DELETE_CONTENT_FAIL,
EDIT_CONTENT_PENDING, EDIT_CONTENT_SUCCESS, EDIT_CONTENT_FAIL,
GET_CONTENT_PENDING, GET_CONTENT_SUCCESS, GET_CONTENT_FAIL,
ADD_CONTENT_PENDING,
ADD_CONTENT_SUCCESS,
ADD_CONTENT_FAIL,
DELETE_CONTENT_PENDING,
DELETE_CONTENT_SUCCESS,
DELETE_CONTENT_FAIL,
EDIT_CONTENT_PENDING,
EDIT_CONTENT_SUCCESS,
EDIT_CONTENT_FAIL,
GET_CONTENT_PENDING,
GET_CONTENT_SUCCESS,
GET_CONTENT_FAIL,
} from '../../constants/ActionTypes';

describe('Content action', () => {
Expand All @@ -13,7 +21,11 @@ describe('Content action', () => {
const content = 'Hello World!';
const action = addContent(url, content);

expect(action.types).toEqual([ADD_CONTENT_PENDING, ADD_CONTENT_SUCCESS, ADD_CONTENT_FAIL]);
expect(action.types).toEqual([
ADD_CONTENT_PENDING,
ADD_CONTENT_SUCCESS,
ADD_CONTENT_FAIL,
]);

const apiMock = {
post: jest.fn(),
Expand Down Expand Up @@ -50,7 +62,11 @@ describe('Content action', () => {
const content = 'Hello World!';
const action = editContent(url, content);

expect(action.types).toEqual([EDIT_CONTENT_PENDING, EDIT_CONTENT_SUCCESS, EDIT_CONTENT_FAIL]);
expect(action.types).toEqual([
EDIT_CONTENT_PENDING,
EDIT_CONTENT_SUCCESS,
EDIT_CONTENT_FAIL,
]);

const apiMock = {
patch: jest.fn(),
Expand All @@ -66,7 +82,11 @@ describe('Content action', () => {
const url = 'http://localhost';
const action = getContent(url);

expect(action.types).toEqual([GET_CONTENT_PENDING, GET_CONTENT_SUCCESS, GET_CONTENT_FAIL]);
expect(action.types).toEqual([
GET_CONTENT_PENDING,
GET_CONTENT_SUCCESS,
GET_CONTENT_FAIL,
]);

const apiMock = {
get: jest.fn(),
Expand Down
7 changes: 6 additions & 1 deletion src/actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@

export getBreadcrumbs from './breadcrumbs/breadcrumbs';
export { copy, cut, copyContent, moveContent } from './clipboard/clipboard';
export { addContent, deleteContent, editContent, getContent } from './content/content';
export {
addContent,
deleteContent,
editContent,
getContent,
} from './content/content';
export getNavigation from './navigation/navigation';
export getSchema from './schema/schema';
export getTypes from './types/types';
Expand Down
10 changes: 8 additions & 2 deletions src/actions/navigation/navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
*/

import {
GET_NAVIGATION_PENDING, GET_NAVIGATION_SUCCESS, GET_NAVIGATION_FAIL,
GET_NAVIGATION_PENDING,
GET_NAVIGATION_SUCCESS,
GET_NAVIGATION_FAIL,
} from '../../constants/ActionTypes';

/**
Expand All @@ -15,7 +17,11 @@ import {
*/
export default function getNavigation(url) {
return {
types: [GET_NAVIGATION_PENDING, GET_NAVIGATION_SUCCESS, GET_NAVIGATION_FAIL],
types: [
GET_NAVIGATION_PENDING,
GET_NAVIGATION_SUCCESS,
GET_NAVIGATION_FAIL,
],
promise: api => api.get(`${url}/@components/navigation`),
};
}
9 changes: 7 additions & 2 deletions src/actions/navigation/navigation.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import getNavigation from './navigation';
import {
GET_NAVIGATION_PENDING, GET_NAVIGATION_SUCCESS, GET_NAVIGATION_FAIL,
GET_NAVIGATION_PENDING,
GET_NAVIGATION_SUCCESS,
GET_NAVIGATION_FAIL,
} from '../../constants/ActionTypes';

describe('Navigation action', () => {
Expand All @@ -10,7 +12,10 @@ describe('Navigation action', () => {
const action = getNavigation(url);

expect(action.types).toEqual([
GET_NAVIGATION_PENDING, GET_NAVIGATION_SUCCESS, GET_NAVIGATION_FAIL]);
GET_NAVIGATION_PENDING,
GET_NAVIGATION_SUCCESS,
GET_NAVIGATION_FAIL,
]);

const apiMock = {
get: jest.fn(),
Expand Down
4 changes: 3 additions & 1 deletion src/actions/schema/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
*/

import {
GET_SCHEMA_PENDING, GET_SCHEMA_SUCCESS, GET_SCHEMA_FAIL,
GET_SCHEMA_PENDING,
GET_SCHEMA_SUCCESS,
GET_SCHEMA_FAIL,
} from '../../constants/ActionTypes';

/**
Expand Down
10 changes: 8 additions & 2 deletions src/actions/schema/schema.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import getSchema from './schema';
import {
GET_SCHEMA_PENDING, GET_SCHEMA_SUCCESS, GET_SCHEMA_FAIL,
GET_SCHEMA_PENDING,
GET_SCHEMA_SUCCESS,
GET_SCHEMA_FAIL,
} from '../../constants/ActionTypes';

describe('Schema action', () => {
Expand All @@ -9,7 +11,11 @@ describe('Schema action', () => {
const type = 'Document';
const action = getSchema(type);

expect(action.types).toEqual([GET_SCHEMA_PENDING, GET_SCHEMA_SUCCESS, GET_SCHEMA_FAIL]);
expect(action.types).toEqual([
GET_SCHEMA_PENDING,
GET_SCHEMA_SUCCESS,
GET_SCHEMA_FAIL,
]);

const apiMock = {
get: jest.fn(),
Expand Down
10 changes: 8 additions & 2 deletions src/actions/search/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
*/

import {
SEARCH_CONTENT_PENDING, SEARCH_CONTENT_SUCCESS, SEARCH_CONTENT_FAIL,
SEARCH_CONTENT_PENDING,
SEARCH_CONTENT_SUCCESS,
SEARCH_CONTENT_FAIL,
} from '../../constants/ActionTypes';

/**
Expand All @@ -15,7 +17,11 @@ import {
*/
export default function searchContent(text) {
return {
types: [SEARCH_CONTENT_PENDING, SEARCH_CONTENT_SUCCESS, SEARCH_CONTENT_FAIL],
types: [
SEARCH_CONTENT_PENDING,
SEARCH_CONTENT_SUCCESS,
SEARCH_CONTENT_FAIL,
],
promise: api => api.get(`/@search?SearchableText=${text}`),
};
}
4 changes: 3 additions & 1 deletion src/actions/search/search.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import searchContent from './search';
import {
SEARCH_CONTENT_PENDING, SEARCH_CONTENT_SUCCESS, SEARCH_CONTENT_FAIL,
SEARCH_CONTENT_PENDING,
SEARCH_CONTENT_SUCCESS,
SEARCH_CONTENT_FAIL,
} from '../../constants/ActionTypes';

describe('Search action', () => {
Expand Down
4 changes: 3 additions & 1 deletion src/actions/types/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
*/

import {
GET_TYPES_PENDING, GET_TYPES_SUCCESS, GET_TYPES_FAIL,
GET_TYPES_PENDING,
GET_TYPES_SUCCESS,
GET_TYPES_FAIL,
} from '../../constants/ActionTypes';

/**
Expand Down
10 changes: 8 additions & 2 deletions src/actions/types/types.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import getTypes from './types';
import {
GET_TYPES_PENDING, GET_TYPES_SUCCESS, GET_TYPES_FAIL,
GET_TYPES_PENDING,
GET_TYPES_SUCCESS,
GET_TYPES_FAIL,
} from '../../constants/ActionTypes';

describe('Types action', () => {
Expand All @@ -9,7 +11,11 @@ describe('Types action', () => {
const url = '/blog';
const action = getTypes(url);

expect(action.types).toEqual([GET_TYPES_PENDING, GET_TYPES_SUCCESS, GET_TYPES_FAIL]);
expect(action.types).toEqual([
GET_TYPES_PENDING,
GET_TYPES_SUCCESS,
GET_TYPES_FAIL,
]);

const apiMock = {
get: jest.fn(),
Expand Down

0 comments on commit a663071

Please sign in to comment.