Skip to content

Commit 04bbcf6

Browse files
committed
jshnit process refactoring
1 parent d40d9be commit 04bbcf6

File tree

5 files changed

+101
-125
lines changed

5 files changed

+101
-125
lines changed

package-lock.json

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

package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
"scripts": {
2222
"prod-build": "webpack",
2323
"prod-test": "karma start test/config/karma.conf.js",
24-
"dev-build": "webpack",
2524
"dev-server": "webpack-dev-server",
2625
"dev-test": "karma start test/config/karma.conf.js",
2726
"hint-tests": "jshint --verbose test",
28-
"start": "npm-run-all --parallel dev-server dev-test",
29-
"test": "npm run hint-tests && npm run dev-test",
30-
"build": "npm run prod-build && npm run prod-test && npm run hint-tests"
27+
"build": "npm run hint-tests && npm run prod-build && npm run prod-test",
28+
"test": "npm run dev-test",
29+
"start": "npm-run-all --parallel dev-server dev-test"
3130
},
3231
"devDependencies": {
3332
"babel-core": "^6.24.1",
@@ -36,18 +35,16 @@
3635
"clean-webpack-plugin": "^0.1.17",
3736
"copy-webpack-plugin": "^4.2.0",
3837
"jasmine-core": "^2.8.0",
39-
"jshint": "^2.5.0",
38+
"jshint": "^2.9.2",
4039
"jshint-loader": "^0.8.4",
4140
"karma": "^1.7.1",
4241
"karma-chrome-launcher": "^2.2.0",
4342
"karma-firefox-launcher": "^1.0.1",
44-
"karma-ie-launcher": "^1.0.0",
4543
"karma-jasmine": "^1.1.0",
4644
"karma-sourcemap-loader": "^0.3.7",
4745
"karma-webpack": "^2.0.6",
4846
"npm-run-all": "^4.1.2",
4947
"webpack": "^3.8.1",
50-
"webpack-dev-middleware": "^1.12.0",
5148
"webpack-dev-server": "^2.9.4"
5249
},
5350
"keywords": [

test/config/karma.conf.files.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ const files = [
55
'../misc/test.css',
66
'../misc/datasources.js',
77
'../misc/scaffolding*.js',
8-
'../*Spec.js'
8+
{
9+
pattern: '../*Spec.js',
10+
watched: false,
11+
served: true,
12+
included: true
13+
}
914
];
1015

1116
module.exports.development = [

test/config/karma.conf.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
const chrome = process.platform === 'linux' ? 'Chromium' : 'Chrome';
2-
const firefox = 'Firefox';
3-
//const ie = 'IE';
42

53
const ENV = (process.env.npm_lifecycle_event.indexOf('dev') === 0) ? 'development' : 'production';
64

@@ -26,7 +24,7 @@ module.exports = function (config) {
2624

2725
exclude: [],
2826

29-
reporters: [ENV === 'development' ? 'dots' : 'progress'],
27+
reporters: ['dots'],
3028

3129
port: ENV === 'development' ? 9100 : 8082,
3230

@@ -39,7 +37,7 @@ module.exports = function (config) {
3937
keepalive: ENV === 'development',
4038

4139
browsers: process.env.TRAVIS ?
42-
[firefox, chrome] :
40+
['Firefox', chrome] :
4341
[chrome],
4442

4543
captureTimeout: 60000,

0 commit comments

Comments
 (0)