diff --git a/package.json b/package.json index b0e39f29e27b..0d130581202f 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "build:full": "npm run clean:full && npm run bootstrap && npm run build && npm run mocha && npm run lint", "pretest": "npm run clean && npm run build:current", "test": "node packages/build/bin/run-nyc npm run mocha", - "mocha": "node packages/build/bin/select-dist mocha --opts packages/build/mocha.opts \"packages/*/DIST/test/**/*.js\" \"packages/cli/test\"", + "mocha": "node packages/build/bin/select-dist mocha --opts packages/build/mocha.ts.opts \"packages/*/DIST/test/**/*.js\" \"packages/cli/test\"", "posttest": "npm run lint" }, "config": { diff --git a/packages/authentication/package.json b/packages/authentication/package.json index e79394379132..e0a203d8d441 100644 --- a/packages/authentication/package.json +++ b/packages/authentication/package.json @@ -6,18 +6,18 @@ "node": ">=6" }, "scripts": { - "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/acceptance/**/*.js'", + "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'", "build": "npm run build:dist && npm run build:dist6", "build:current": "lb-tsc", "build:dist": "lb-tsc es2017", "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-authentication*.tgz dist dist6 package api-docs", - "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/integration/**/*.js'", + "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/integration/**/*.js'", "prepare": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", - "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'", - "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js'", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'", + "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'", "verify": "npm pack && tar xf loopback-authentication*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/build/mocha.opts b/packages/build/mocha.js.opts similarity index 100% rename from packages/build/mocha.opts rename to packages/build/mocha.js.opts diff --git a/packages/build/mocha.ts.opts b/packages/build/mocha.ts.opts new file mode 100644 index 000000000000..0cf9a4cfa1a4 --- /dev/null +++ b/packages/build/mocha.ts.opts @@ -0,0 +1,4 @@ +--recursive +--exit +--reporter dot +--require source-map-support/register diff --git a/packages/build/package.json b/packages/build/package.json index dd98a28b84b4..f28ea79da397 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -40,11 +40,10 @@ "prettier:check": "npm run prettier:cli -- -l", "prettier:fix": "npm run prettier:cli -- --write", "test": "npm run mocha", - "mocha": "node bin/select-dist mocha --timeout 30000 \"test/integration/*.js\"", + "mocha": "node bin/select-dist mocha --opts mocha.js.opts --timeout 30000 \"test/integration/*.js\"", "posttest": "npm run lint" }, "devDependencies": { - "fs-extra": "^5.0.0", - "source-map-support": "^0.5.2" + "fs-extra": "^5.0.0" } } diff --git a/packages/cli/package.json b/packages/cli/package.json index b0c49b117f13..5d342ea3cc12 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -33,7 +33,6 @@ "nsp": "^3.1.0", "rimraf": "^2.6.2", "sinon": "^4.1.2", - "source-map-support": "^0.5.2", "yeoman-assert": "^3.1.0", "yeoman-test": "^1.7.0" }, @@ -55,7 +54,7 @@ }, "scripts": { "prepublishOnly": "nsp check", - "test": "mocha test/**/*.js" + "test": "mocha --opts node_modules/@loopback/build/mocha.js.opts test/**/*.js" }, "repository": { "type": "git", diff --git a/packages/context/package.json b/packages/context/package.json index 763e60a19afc..446bda429c3e 100644 --- a/packages/context/package.json +++ b/packages/context/package.json @@ -6,7 +6,7 @@ "node": ">=6" }, "scripts": { - "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/acceptance/**/*.js'", + "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'", "build": "npm run build:dist && npm run build:dist6", "build:current": "lb-tsc", "build:dist": "lb-tsc es2017", @@ -15,8 +15,8 @@ "clean": "lb-clean loopback-context*.tgz dist dist6 package api-docs", "prepare": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", - "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'", - "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js'", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'", + "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'", "verify": "npm pack && tar xf loopback-context*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/core/package.json b/packages/core/package.json index 83f75e285aad..6e929f18ac6f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -6,7 +6,7 @@ "node": ">=6" }, "scripts": { - "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/acceptance/**/*.js'", + "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'", "build": "npm run build:dist && npm run build:dist6", "build:current": "lb-tsc", "build:dist": "lb-tsc es2017", @@ -15,9 +15,9 @@ "clean": "lb-clean loopback-core*.tgz dist dist6 package api-docs", "prepare": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", - "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/integration/**/*.js'", - "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'", - "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js'", + "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/integration/**/*.js'", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'", + "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'", "verify": "npm pack && tar xf loopback-core*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/example-getting-started/package.json b/packages/example-getting-started/package.json index 4854100d9753..9a9dbeb4bb1e 100644 --- a/packages/example-getting-started/package.json +++ b/packages/example-getting-started/package.json @@ -8,7 +8,7 @@ "node": ">=8" }, "scripts": { - "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/acceptance/**/*.js'", + "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'", "build": "npm run build:dist && npm run build:dist6", "build:current": "lb-tsc", "build:dist": "lb-tsc es2017", @@ -17,8 +17,8 @@ "clean": "lb-clean loopback-getting-started*.tgz dist dist6 package api-docs", "prepare": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", - "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'", - "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js'", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'", + "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'", "verify": "npm pack && tar xf loopback-getting-started*.tgz && tree package && npm run clean", "start": "npm run build && node ." }, diff --git a/packages/metadata/package.json b/packages/metadata/package.json index f0ab08afb247..3a6e923b4b8d 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -6,7 +6,7 @@ "node": ">=6" }, "scripts": { - "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/acceptance/**/*.js'", + "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'", "build": "npm run build:dist && npm run build:dist6", "build:current": "lb-tsc", "build:dist": "lb-tsc es2017", @@ -15,8 +15,8 @@ "clean": "lb-clean loopback-metadata*.tgz dist dist6 package api-docs", "prepare": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", - "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'", - "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js'", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'", + "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'", "verify": "npm pack && tar xf loopback-metadata*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/openapi-v2/package.json b/packages/openapi-v2/package.json index 6325053db801..61d74e55ac45 100644 --- a/packages/openapi-v2/package.json +++ b/packages/openapi-v2/package.json @@ -20,7 +20,7 @@ "clean": "rm -rf loopback-openapi-v2*.tgz dist* package", "prepare": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", - "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js'", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'", "verify": "npm pack && tar xf loopback-openapi-v2*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/repository/package.json b/packages/repository/package.json index 310b1e80dbf8..1e46a2fef403 100644 --- a/packages/repository/package.json +++ b/packages/repository/package.json @@ -7,7 +7,7 @@ }, "main": "index", "scripts": { - "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/acceptance/**/*.js'", + "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'", "build": "npm run build:dist && npm run build:dist6", "build:current": "lb-tsc", "build:dist": "lb-tsc es2017", @@ -16,8 +16,8 @@ "clean": "lb-clean loopback-repository*.tgz dist dist6 package api-docs", "prepare": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", - "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'", - "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js'", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'", + "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'", "verify": "npm pack && tar xf loopback-juggler*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/rest/package.json b/packages/rest/package.json index 450a6bb6f07c..97fac030a99e 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -6,7 +6,7 @@ "node": ">=6" }, "scripts": { - "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/acceptance/**/*.js'", + "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'", "build": "npm run build:dist && npm run build:dist6", "build:current": "lb-tsc", "build:dist": "lb-tsc es2017", @@ -15,9 +15,9 @@ "clean": "lb-clean loopback-rest*.tgz dist dist6 package api-docs", "prepare": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", - "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/integration/**/*.js'", - "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'", - "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'DIST/test/unit/**/*.js'", + "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/integration/**/*.js'", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'", + "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'", "verify": "npm pack && tar xf loopback-rest*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/testlab/package.json b/packages/testlab/package.json index 63fe25b4ffbc..f56fa9e21380 100644 --- a/packages/testlab/package.json +++ b/packages/testlab/package.json @@ -13,7 +13,7 @@ "clean": "lb-clean loopback-testlab*.tgz dist dist6 package api-docs", "prepare": "npm run build", "pretest": "npm run build:current", - "test": "lb-dist mocha --recursive DIST/test", + "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts DIST/test", "verify": "npm pack && tar xf loopback-testlab*.tgz && tree package && npm run clean" }, "author": "IBM",