Skip to content

Commit f653591

Browse files
shockeyshockey
authored
Merge pull request swagger-api#2776 from shockey/ft/linting-and-testing
Linting and testing
2 parents 19558e7 + ec9c554 commit f653591

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+246
-508
lines changed

‎.eslintrc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"parser": "babel-eslint",
3+
4+
"env": {
5+
"browser": true,
6+
"node": true,
7+
"es6": true
8+
},
9+
10+
"parserOptions": {
11+
"ecmaFeatures": {
12+
"jsx": true
13+
}
14+
},
15+
16+
"extends": ["eslint:recommended", "plugin:react/recommended"],
17+
18+
"plugins": [
19+
"react"
20+
],
21+
22+
"rules": {
23+
"semi": [2, "never"],
24+
"strict": 0,
25+
"quotes": 2,
26+
"no-unused-vars": 2,
27+
"no-multi-spaces": 1,
28+
"camelcase": 1,
29+
"no-use-before-define": [2,"nofunc"],
30+
"no-underscore-dangle": 0,
31+
"no-unused-expressions": 1,
32+
"comma-dangle": 0,
33+
"no-console": ["error", { allow: ["warn", "error"] }],
34+
"react/jsx-no-bind": 1,
35+
"react/display-name": 0
36+
}
37+
}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ node_modules
33
.deps_check
44
.DS_Store
55
npm-debug.log
6+
.eslintcache

‎dist/swagger-ui-bundle.js

Lines changed: 40 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/swagger-ui-bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/swagger-ui-standalone-preset.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/swagger-ui.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/swagger-ui.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,13 @@
2626
"deps-license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv",
2727
"deps-size": "webpack -p --config webpack.check.js --json | webpack-bundle-size-analyzer >| $npm_package_config_deps_check_dir/sizes.txt",
2828
"deps-check": "npm run deps-license && npm run deps-size",
29-
"just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core"
29+
"lint": "eslint --cache --ext '.js,.jsx' src test",
30+
"lint-errors": "eslint --cache --quiet --ext '.js,.jsx' src test",
31+
"lint-fix": "eslint --cache --ext '.js,.jsx' src test --fix",
32+
"test": "npm run lint-errors && npm run just-test-in-node",
33+
"test-in-node": "npm run lint-errors && npm run just-test-in-node",
34+
"just-test": "karma start --config karma.conf.js",
35+
"just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core test/components"
3036
},
3137
"dependencies": {
3238
"brace": "0.7.0",
@@ -46,7 +52,7 @@
4652
"react": "^15.4.0",
4753
"react-addons-perf": "0.14.8",
4854
"react-addons-shallow-compare": "0.14.8",
49-
"react-addons-test-utils": "0.14.8",
55+
"react-addons-test-utils": "^15.4.0",
5056
"react-collapse": "2.3.1",
5157
"react-dom": "^15.4.0",
5258
"react-height": "^2.0.0",
@@ -84,11 +90,19 @@
8490
"css-loader": "0.22.0",
8591
"deep-extend": "^0.4.1",
8692
"deepmerge": "^1.3.2",
93+
"enzyme": "^2.7.1",
94+
"eslint": "^2.13.1",
95+
"eslint-plugin-react": "^6.10.3",
8796
"extract-text-webpack-plugin": "0.8.2",
8897
"file-loader": "0.8.4",
8998
"html-webpack-plugin": "^2.28.0",
9099
"imports-loader": "0.6.5",
91100
"json-loader": "0.5.3",
101+
"karma": "^0.13.22",
102+
"karma-chrome-launcher": "^0.2.3",
103+
"karma-mocha": "^0.2.2",
104+
"karma-sourcemap-loader": "^0.3.7",
105+
"karma-webpack": "1.8.0",
92106
"less": "2.5.3",
93107
"less-loader": "2.2.1",
94108
"license-checker": "^8.0.4",

‎src/core/components/auth/authorize-btn.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default class AuthorizeBtn extends React.Component {
66
}
77

88
onClick =() => {
9-
let { authActions, authSelectors, errActions} = this.props
9+
let { authActions, authSelectors } = this.props
1010
let definitions = authSelectors.definitionsToAuthorize()
1111

1212
authActions.showDefinitions(definitions)

‎src/core/components/auth/auths.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,12 @@ export default class Auths extends React.Component {
4242
}
4343

4444
render() {
45-
let { definitions, getComponent, authSelectors, errSelectors, specSelectors } = this.props
45+
let { definitions, getComponent, authSelectors, errSelectors } = this.props
4646
const ApiKeyAuth = getComponent("apiKeyAuth")
4747
const BasicAuth = getComponent("basicAuth")
4848
const Oauth2 = getComponent("oauth2", true)
4949
const Button = getComponent("Button")
50-
const JumpToPath = getComponent("JumpToPath", true)
5150

52-
let specStr = specSelectors.specStr()
5351
let authorized = authSelectors.authorized()
5452

5553
let authorizedAuth = definitions.filter( (definition, key) => {

0 commit comments

Comments
 (0)