Skip to content

Commit

Permalink
revert last change
Browse files Browse the repository at this point in the history
  • Loading branch information
kulshekhar committed Dec 18, 2017
1 parent efc8dbc commit 540ad1b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Expand Up @@ -11,7 +11,6 @@ before_install:
before_script:
# - greenkeeper-lockfile-update
script:
- yarn test:prepare
- ./node_modules/.bin/jest --no-cache
- yarn test
after_script:
# - greenkeeper-lockfile-upload
3 changes: 1 addition & 2 deletions appveyor.yml
Expand Up @@ -30,5 +30,4 @@ test_script:
- node --version
- npm --version
- yarn --version
- cmd: yarn test:prepare
- cmd: ./node_modules/.bin/jest --no-cache
- cmd: yarn test
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -10,7 +10,7 @@
"clean": "rimraf dist/**/* && rimraf tests/simple/coverage && rimraf tests/simple-async/coverage",
"clean-build": "npm run clean && npm run build",
"pretest": "npm run tslint && npm run clean-build",
"test:prepare": "node scripts/tests.js",
"test": "node scripts/tests.js",
"tslint": "tslint src/*.ts",
"doc": "doctoc .",
"prepublish": "npm run clean-build",
Expand Down
14 changes: 14 additions & 0 deletions scripts/tests.js
Expand Up @@ -64,3 +64,17 @@ function createIntegrationMock() {
}

createIntegrationMock();

const argv = process.argv.slice(2);
argv.push('--no-cache');
// Watch unless on CI
if (!process.env.CI) {
// argv.push('--watch');
}
// omit tests for watch cases if it runned on AppVeyor due to this issues:
// https://github.com/kulshekhar/ts-jest/issues/53
// http://help.appveyor.com/discussions/problems/5500-nodejs-child-process-with-watch-and-stderr-problem

argv.push('--testPathPattern', '^(?!(.*watch.spec.ts$)).*');

jest.run(argv);

0 comments on commit 540ad1b

Please sign in to comment.