Skip to content

Commit b2b6cf7

Browse files
committed
improve performance of karma
1 parent 9ca6c14 commit b2b6cf7

File tree

4 files changed

+28
-19
lines changed

4 files changed

+28
-19
lines changed

karma.conf.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,30 @@ const webpackConfig = require("./webpack.config.js")({ production: false, karma:
99
delete webpackConfig.entry;
1010

1111
module.exports = config => {
12+
"use strict";
1213

1314
var configuration = {
15+
client: {
16+
mocha: {
17+
timeout : 5000
18+
}
19+
},
1420
basePath: "",
1521
frameworks: [
1622
"mocha",
17-
"chai",
18-
"sinon",
23+
"sinon-chai",
1924
"es6-shim"
2025
],
2126
files: [
2227
{ pattern: "node_modules/reflect-metadata/Reflect.js", include: true },
2328
{ pattern: "node_modules/bluebird/js/browser/bluebird.js", include: true },
2429
{ pattern: "node_modules/easeljs/lib/easeljs.js", include: true },
25-
{ pattern: "./test/**/**/**.test.ts", include: true },
30+
{ pattern: "./test/index.ts", include: true },
2631
{ pattern: '**/*.map', served: true, included: false, watched: true }
2732
],
2833
preprocessors: {
29-
"./**/**/**/**.ts": ["sourcemap"],
30-
"./test/**/**/**.test.ts": ["webpack"]
34+
"./test/index.ts": ["webpack"],
35+
"./**/**/**/**.ts": ["sourcemap"]
3136
},
3237
webpack: webpackConfig,
3338
webpackMiddleware: {
@@ -40,11 +45,13 @@ module.exports = config => {
4045
"karma-remap-istanbul",
4146
"karma-mocha-reporter",
4247
"karma-mocha",
43-
"karma-chai",
44-
"karma-sinon",
48+
"karma-sinon-chai",
4549
"karma-es6-shim",
4650
"karma-coverage-istanbul-reporter"
4751
],
52+
mime: {
53+
"text/x-typescript": ["ts","tsx"]
54+
},
4855
reporters: (
4956
config.singleRun ?
5057
["dots", "mocha", "coverage-istanbul"] :
@@ -64,6 +71,7 @@ module.exports = config => {
6471
colors: true,
6572
logLevel: config.LOG_INFO,
6673
autoWatch: true,
74+
concurrency: Infinity,
6775
browsers: [],
6876
browserNoActivityTimeout: 50000
6977
};

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"@types/easeljs": "^1.0.0",
6363
"@types/mocha": "^5.2.5",
6464
"@types/sinon": "^5.0.7",
65+
"@types/webpack-env": "^1.13.6",
6566
"bluebird": "^3.5.3",
6667
"browserify-versionify": "^1.0.6",
6768
"chai": "^4.2.0",
@@ -74,14 +75,12 @@
7475
"istanbul": "^0.4.5",
7576
"istanbul-instrumenter-loader": "^3.0.1",
7677
"karma": "^3.1.1",
77-
"karma-chai": "^0.1.0",
7878
"karma-chrome-launcher": "^2.2.0",
7979
"karma-coverage-istanbul-reporter": "^2.0.4",
8080
"karma-es6-shim": "^1.0.0",
8181
"karma-mocha": "^1.3.0",
8282
"karma-mocha-reporter": "^2.2.5",
8383
"karma-remap-istanbul": "^0.6.0",
84-
"karma-sinon": "^1.0.5",
8584
"karma-sinon-chai": "^2.0.2",
8685
"karma-sourcemap-loader": "^0.3.7",
8786
"karma-sourcemap-writer": "^0.1.2",

test/index.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference types="webpack-env" />
2+
3+
// require all modules ending in ".test.ts" from the
4+
// current directory and all subdirectories
5+
const testsContext = require.context(".", true, /\.test\.ts$/);
6+
7+
testsContext.keys().forEach(testsContext);

yarn.lock

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@
179179
dependencies:
180180
"@types/createjs-lib" "*"
181181

182+
"@types/webpack-env@^1.13.6":
183+
version "1.13.6"
184+
resolved "http://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.6.tgz#128d1685a7c34d31ed17010fc87d6a12c1de6976"
185+
integrity sha512-5Th3OsZ4gTRdr9Mho83BQ23cex4sRhOR4XTG+m+cJc0FhtUBK9Vn62hBJ+pnQYnSxoPOsKoAPOx6FcphxBC8ng==
186+
182187
"@webassemblyjs/[email protected]":
183188
version "1.7.11"
184189
resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
@@ -3769,11 +3774,6 @@ just-extend@^3.0.0:
37693774
resolved "https://registry.npmjs.org/just-extend/-/just-extend-3.0.0.tgz#cee004031eaabf6406da03a7b84e4fe9d78ef288"
37703775
integrity sha512-Fu3T6pKBuxjWT/p4DkqGHFRsysc8OauWr4ZRTY9dIx07Y9O0RkoR5jcv28aeD1vuAwhm3nLkDurwLXoALp4DpQ==
37713776

3772-
karma-chai@^0.1.0:
3773-
version "0.1.0"
3774-
resolved "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz#bee5ad40400517811ae34bb945f762909108b79a"
3775-
integrity sha1-vuWtQEAFF4Ea40u5RfdikJEIt5o=
3776-
37773777
karma-chrome-launcher@^2.2.0:
37783778
version "2.2.0"
37793779
resolved "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
@@ -3827,11 +3827,6 @@ karma-sinon-chai@^2.0.2:
38273827
resolved "https://registry.npmjs.org/karma-sinon-chai/-/karma-sinon-chai-2.0.2.tgz#e28c109b989973abafc28a7c9f09ef24a05e07c2"
38283828
integrity sha512-SDgh6V0CUd+7ruL1d3yG6lFzmJNGRNQuEuCYXLaorruNP9nwQfA7hpsp4clx4CbOo5Gsajh3qUOT7CrVStUKMw==
38293829

3830-
karma-sinon@^1.0.5:
3831-
version "1.0.5"
3832-
resolved "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz#4e3443f2830fdecff624d3747163f1217daa2a9a"
3833-
integrity sha1-TjRD8oMP3s/2JNN0cWPxIX2qKpo=
3834-
38353830
karma-sourcemap-loader@^0.3.7:
38363831
version "0.3.7"
38373832
resolved "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"

0 commit comments

Comments
 (0)