Skip to content

Commit b3fed58

Browse files
committed
[Tests] improve scripts
1 parent c99d8fa commit b3fed58

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

.travis.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
language: node_js
2+
os:
3+
- linux
24
node_js:
35
- "8"
46
- "7"
@@ -11,11 +13,13 @@ node_js:
1113
- "0.12"
1214
before_install:
1315
- 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then npm install -g [email protected] ; elif [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then case "$(npm --version)" in 1.*) npm install -g [email protected] ;; 2.*) npm install -g npm@2 ;; esac ; fi'
14-
- 'if [ "${TRAVIS_NODE_VERSION%${TRAVIS_NODE_VERSION#[0-9]}}" = "0" ] || [ "${TRAVIS_NODE_VERSION:0:4}" = "iojs" ]; then npm install -g [email protected] ; elif [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then npm install -g npm; fi'
16+
- 'if [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then if [ "${TRAVIS_NODE_VERSION%${TRAVIS_NODE_VERSION#[0-9]}}" = "0" ] || [ "${TRAVIS_NODE_VERSION:0:4}" = "iojs" ]; then npm install -g npm@4.5 ; else npm install -g npm; fi; fi'
1517
install:
1618
- 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then nvm install 0.8 && npm install -g [email protected] && npm install -g [email protected] && npm install -g npm@2 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;'
1719
script:
18-
- 'if [ -n "${LINT-}" ]; then npm run lint ; fi'
20+
- 'if [ -n "${PRETEST-}" ]; then npm run pretest ; fi'
21+
- 'if [ -n "${POSTTEST-}" ]; then npm run posttest ; fi'
22+
- 'if [ -n "${COVERAGE-}" ]; then npm run coverage ; fi'
1923
- 'if [ -n "${TEST-}" ]; then npm run tests-only ; fi'
2024
sudo: false
2125
env:
@@ -24,11 +28,13 @@ matrix:
2428
fast_finish: true
2529
include:
2630
- node_js: "node"
27-
env: LINT=true
31+
env: PRETEST=true
2832
allow_failures:
2933
- node_js: "7"
3034
- node_js: "5"
3135
- node_js: "iojs-v3"
3236
- node_js: "iojs-v2"
3337
- node_js: "iojs-v1"
3438
- node_js: "0.12"
39+
- env: TEST=true ALLOW_FAILURE=true
40+
- env: COVERAGE=true

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
"test": "test"
88
},
99
"scripts": {
10-
"build": "babel src --out-dir lib",
1110
"clean": "rimraf lib",
12-
"test": "npm run lint && npm run tests-only",
11+
"prebuild": "npm run clean",
12+
"build": "babel src --out-dir lib",
13+
"pretest": "npm run lint",
14+
"test": "npm run tests-only",
1315
"tests-only": "mocha",
1416
"lint": "eslint .",
15-
"prepublish": "in-publish && safe-publish-latest && npm run build || not-in-publish",
17+
"prepublish": "not-in-publish || (safe-publish-latest && npm run build)",
1618
"check-changelog": "expr $(git status --porcelain 2>/dev/null| grep \"^\\s*M.*CHANGELOG.md\" | wc -l) >/dev/null || (echo 'Please edit CHANGELOG.md' && exit 1)",
1719
"check-only-changelog-changed": "(expr $(git status --porcelain 2>/dev/null| grep -v \"CHANGELOG.md\" | wc -l) >/dev/null && echo 'Only CHANGELOG.md may have uncommitted changes' && exit 1) || exit 0",
1820
"version:major": "npm --no-git-tag-version version major",

0 commit comments

Comments
 (0)