diff --git a/.travis.yml b/.travis.yml index d61372dc0ebd..038b5c3b06e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_script: - npm run bootstrap script: - - npm run test:ci + - npm test after_success: - npm run coverage:ci diff --git a/appveyor.yml b/appveyor.yml index 237c580ab37c..fda3f0bec211 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ install: test_script: - node --version - npm --version - - npm run test:ci + - npm test build: off skip_branch_with_pr: true diff --git a/package.json b/package.json index 6b1a4f5a87bf..ce2f2becba6e 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "build:full": "npm run clean:lerna && 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", - "test:ci": "node packages/build/bin/run-nyc npm run mocha && npm run posttest", "mocha": "node packages/build/bin/run-mocha \"packages/*/DIST/test/**/*.js\" \"packages/cli/test/*.js\"", "posttest": "npm run lint" }, diff --git a/packages/authentication/package.json b/packages/authentication/package.json index 9f5d76ae928c..1484f83bafb4 100644 --- a/packages/authentication/package.json +++ b/packages/authentication/package.json @@ -14,7 +14,7 @@ "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-authentication*.tgz dist dist6 package api-docs", "integration": "lb-mocha \"DIST/test/integration/**/*.js\"", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"", "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", diff --git a/packages/cli/generators/project/templates/package.json b/packages/cli/generators/project/templates/package.json index 6496ee6a0878..39d27328fb0c 100644 --- a/packages/cli/generators/project/templates/package.json +++ b/packages/cli/generators/project/templates/package.json @@ -43,7 +43,7 @@ <% if (project.projectType === 'application') { -%> "start": "npm run build && node .", <% } -%> - "prepare": "npm run build" + "prepublishOnly": "npm run test" }, "repository": { "type": "git" diff --git a/packages/context/package.json b/packages/context/package.json index e599ac4967ef..651cc9f58576 100644 --- a/packages/context/package.json +++ b/packages/context/package.json @@ -13,7 +13,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-context*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"", "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", diff --git a/packages/core/package.json b/packages/core/package.json index 8aeafc9348db..803f5e2db035 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -13,7 +13,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-core*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "integration": "lb-mocha \"DIST/test/integration/**/*.js\"", "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"", diff --git a/packages/example-getting-started/package.json b/packages/example-getting-started/package.json index 2c720c8d6e8b..57f82f668657 100644 --- a/packages/example-getting-started/package.json +++ b/packages/example-getting-started/package.json @@ -15,7 +15,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean *example-getting-started*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"", "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", diff --git a/packages/example-log-extension/package.json b/packages/example-log-extension/package.json index d42f8eff7fec..7de955ad791e 100644 --- a/packages/example-log-extension/package.json +++ b/packages/example-log-extension/package.json @@ -22,7 +22,7 @@ "prettier:fix": "npm run prettier:cli -- --write", "tslint": "lb-tslint", "tslint:fix": "npm run tslint -- --fix", - "prepare": "npm run build", + "prepublishOnly": "npm run build", "pretest": "npm run clean && npm run build:current", "test": "lb-dist mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"", "posttest": "npm run lint", diff --git a/packages/example-rpc-server/package.json b/packages/example-rpc-server/package.json index 2078e1e36cb8..c0c43114e984 100644 --- a/packages/example-rpc-server/package.json +++ b/packages/example-rpc-server/package.json @@ -28,7 +28,7 @@ "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts DIST/test", "posttest": "npm run lint", "start": "npm run build && node .", - "prepare": "npm run build" + "prepublishOnly": "npm run build" }, "repository": { "type": "git", diff --git a/packages/metadata/package.json b/packages/metadata/package.json index e5219e981851..e0be2f4b9836 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -13,7 +13,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-metadata*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"", "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", diff --git a/packages/openapi-spec-builder/package.json b/packages/openapi-spec-builder/package.json index 1d4ae60a39d5..f84ecc6ac372 100644 --- a/packages/openapi-spec-builder/package.json +++ b/packages/openapi-spec-builder/package.json @@ -12,7 +12,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-openapi-spec*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "verify": "npm pack && tar xf loopback-openapi-spec*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/openapi-spec/package.json b/packages/openapi-spec/package.json index 9c990a727346..8ec3f194d04b 100644 --- a/packages/openapi-spec/package.json +++ b/packages/openapi-spec/package.json @@ -15,7 +15,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-openapi-spec*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "verify": "npm pack && tar xf loopback-openapi-spec*.tgz && tree package && npm run clean" }, "author": "IBM", diff --git a/packages/openapi-v2/package.json b/packages/openapi-v2/package.json index 869ab9baa750..893548c3e58c 100644 --- a/packages/openapi-v2/package.json +++ b/packages/openapi-v2/package.json @@ -20,7 +20,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-openapi-v2*.tgz dist* package", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "test": "lb-mocha \"DIST/test/unit/**/*.js\"", "verify": "npm pack && tar xf loopback-openapi-v2*.tgz && tree package && npm run clean" diff --git a/packages/repository-json-schema/package.json b/packages/repository-json-schema/package.json index 997704d1b80a..8486c405df44 100644 --- a/packages/repository-json-schema/package.json +++ b/packages/repository-json-schema/package.json @@ -12,7 +12,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-json-schema*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"", "verify": "npm pack && tar xf loopback-json-schema*.tgz && tree package && npm run clean" diff --git a/packages/repository/package.json b/packages/repository/package.json index cada4349c612..5cdf6914fd38 100644 --- a/packages/repository/package.json +++ b/packages/repository/package.json @@ -14,7 +14,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-repository*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"", "unit": "lb-mocha \"DIST/test/unit/**/*.js\"", diff --git a/packages/rest/package.json b/packages/rest/package.json index 75302d471ce0..07c8a6ece362 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -13,7 +13,7 @@ "build:dist6": "lb-tsc es2015", "build:apidocs": "lb-apidocs", "clean": "lb-clean loopback-rest*.tgz dist dist6 package api-docs", - "prepare": "npm run build && npm run build:apidocs", + "prepublishOnly": "npm run build && npm run build:apidocs", "pretest": "npm run build:current", "integration": "lb-mocha \"DIST/test/integration/**/*.js\"", "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"", diff --git a/packages/testlab/package.json b/packages/testlab/package.json index 4f2dc9c98aeb..afc38e2fbb16 100644 --- a/packages/testlab/package.json +++ b/packages/testlab/package.json @@ -11,7 +11,7 @@ "build:dist": "lb-tsc es2017", "build:dist6": "lb-tsc es2015", "clean": "lb-clean loopback-testlab*.tgz dist dist6 package api-docs", - "prepare": "npm run build", + "prepublishOnly": "npm run build", "pretest": "npm run build:current", "test": "lb-mocha \"DIST/test\"", "verify": "npm pack && tar xf loopback-testlab*.tgz && tree package && npm run clean"