Skip to content

Commit

Permalink
debug test
Browse files Browse the repository at this point in the history
  • Loading branch information
filipesilva committed Mar 20, 2017
1 parent 58299dd commit fd29bfb
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 34 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ install:
test_script:
- node --version
- yarn --version
- yarn test
- node tests\run_e2e.js
# - yarn test
# - node tests\run_e2e.js

build: off
61 changes: 32 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,39 @@ matrix:
include:
- node_js: "6"
os: linux
env: SCRIPT=lint
- node_js: "6"
os: linux
env: SCRIPT=build
- node_js: "6"
os: linux
env: SCRIPT=test
- node_js: "6"
os: linux
env: NODE_SCRIPT="tests/run_e2e.js --glob=tests/build/**"
- node_js: "6"
os: linux
env: NODE_SCRIPT="tests/run_e2e.js --eject --glob=tests/build/**"
- node_js: "6"
os: linux
env: NODE_SCRIPT="tests/run_e2e.js --ignore=**/tests/build/**"
- node_js: "6"
os: linux
env: NODE_SCRIPT="tests/run_e2e.js --ng4 --glob=tests/build/**"
- node_js: "6"
os: linux
env: NODE_SCRIPT="tests/run_e2e.js --ng4 --ignore=**/tests/build/**"
env: NODE_SCRIPT="tests/run_e2e.js tests/e2e/tests/test/test-fail-watch.ts"
# - node_js: "6"
# os: linux
# env: SCRIPT=lint
# - node_js: "6"
# os: linux
# env: SCRIPT=build
# - node_js: "6"
# os: linux
# env: SCRIPT=test
# - node_js: "6"
# os: linux
# env: NODE_SCRIPT="tests/run_e2e.js --glob=tests/build/**"
# - node_js: "6"
# os: linux
# env: NODE_SCRIPT="tests/run_e2e.js --eject --glob=tests/build/**"
# - node_js: "6"
# os: linux
# env: NODE_SCRIPT="tests/run_e2e.js --ignore=**/tests/build/**"
# - node_js: "6"
# os: linux
# env: NODE_SCRIPT="tests/run_e2e.js --ng4 --glob=tests/build/**"
# - node_js: "6"
# os: linux
# env: NODE_SCRIPT="tests/run_e2e.js --ng4 --ignore=**/tests/build/**"

# Optional builds.
- node_js: "6"
os: linux
env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
- node_js: "7"
os: linux
env: NODE_SCRIPT=tests/run_e2e.js
# # Optional builds.
# - node_js: "6"
# os: linux
# env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
# - node_js: "7"
# os: linux
# env: NODE_SCRIPT=tests/run_e2e.js

before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/tests/test/test-fail-watch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import { expectToFail } from '../../utils/utils';
import { readFile, writeFile } from '../../utils/fs';


const karmaGoodRegEx = /Executed 3 of 3 SUCCESS/;
// Karma is only really finished with a run when it shows a non-zero total time in the first slot.
const karmaGoodRegEx = /Executed 3 of 3 SUCCESS \(\d+\.\d+ secs/;

export default function () {
let originalSpec: string;
Expand All @@ -25,4 +26,3 @@ export default function () {
throw err;
});
}

2 changes: 1 addition & 1 deletion tests/e2e/utils/process.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export function execAndWaitForOutputToMatch(cmd: string, args: string[], match:
}

export function silentExecAndWaitForOutputToMatch(cmd: string, args: string[], match: RegExp) {
return _exec({ silent: true, waitForMatch: match }, cmd, args);
return _exec({ silent: false, waitForMatch: match }, cmd, args);
}


Expand Down

0 comments on commit fd29bfb

Please sign in to comment.