Skip to content

Commit b203786

Browse files
committed
wip
1 parent 0372953 commit b203786

File tree

3 files changed

+78
-69
lines changed

3 files changed

+78
-69
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ install:
1212
test_script:
1313
- node --version
1414
- yarn --version
15-
- node tests\run_e2e.js --appveyor
15+
# - node tests\run_e2e.js --appveyor
1616

1717
build: off
1818

.travis.yml

Lines changed: 70 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -17,75 +17,79 @@ matrix:
1717
- node_js: "8"
1818
include:
1919
- stage: build
20-
script: npm run lint
21-
env: lint
22-
- script: npm run build
23-
env: build
24-
25-
- stage: test
26-
script: npm run test
27-
env: test
28-
- node_js: "6"
29-
os: linux
30-
script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent
31-
env: e2e-0
32-
- node_js: "6"
33-
os: linux
34-
script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent
35-
env: e2e-1
36-
- node_js: "6"
20+
node_js: "6"
3721
os: linux
38-
script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent
39-
env: e2e-2
40-
- node_js: "6"
41-
os: linux
42-
script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
43-
env: e2e-3
44-
- node_js: "6"
45-
os: linux
46-
script: node tests/run_e2e.js --eject "--glob=tests/build/**"
47-
env: eject
22+
script: node tests/run_e2e.js "--glob=tests/test/test-fail-watch.ts"
23+
# - stage: build
24+
# script: npm run lint
25+
# env: lint
26+
# - script: npm run build
27+
# env: build
4828

49-
# Optional builds.
50-
- node_js: "6"
51-
os: linux
52-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
53-
script: node tests/run_e2e.js --ng2 "--glob=tests/{build,test,misc}/**"
54-
env: ng2
55-
- node_js: "6"
56-
os: linux
57-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
58-
script: node tests/run_e2e.js "--nightly --glob=tests/{build,test,misc}/**"
59-
env: nightly
60-
- node_js: "7"
61-
os: linux
62-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
63-
script: node tests/run_e2e.js "--glob=tests/{build,test,misc}/**"
64-
env: node7
65-
- node_js: "8"
66-
os: linux
67-
before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
68-
script: node tests/run_e2e.js "--glob=tests/build/**"
69-
env: node8
29+
# - stage: test
30+
# script: npm run test
31+
# env: test
32+
# - node_js: "6"
33+
# os: linux
34+
# script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent
35+
# env: e2e-0
36+
# - node_js: "6"
37+
# os: linux
38+
# script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent
39+
# env: e2e-1
40+
# - node_js: "6"
41+
# os: linux
42+
# script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent
43+
# env: e2e-2
44+
# - node_js: "6"
45+
# os: linux
46+
# script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
47+
# env: e2e-3
48+
# - node_js: "6"
49+
# os: linux
50+
# script: node tests/run_e2e.js --eject "--glob=tests/build/**"
51+
# env: eject
52+
53+
# # Optional builds.
54+
# - node_js: "6"
55+
# os: linux
56+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
57+
# script: node tests/run_e2e.js --ng2 "--glob=tests/{build,test,misc}/**"
58+
# env: ng2
59+
# - node_js: "6"
60+
# os: linux
61+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
62+
# script: node tests/run_e2e.js "--nightly --glob=tests/{build,test,misc}/**"
63+
# env: nightly
64+
# - node_js: "7"
65+
# os: linux
66+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
67+
# script: node tests/run_e2e.js "--glob=tests/{build,test,misc}/**"
68+
# env: node7
69+
# - node_js: "8"
70+
# os: linux
71+
# before_script: if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
72+
# script: node tests/run_e2e.js "--glob=tests/build/**"
73+
# env: node8
7074

71-
- stage: deploy
72-
script: skip
73-
env: builds
74-
deploy:
75-
- provider: script
76-
script: node scripts/git-builds.js
77-
skip_cleanup: true
78-
on:
79-
all_branches: true
80-
- stage: deploy
81-
script: skip
82-
env: publish
83-
deploy:
84-
- provider: script
85-
script: node scripts/publish/publish.js
86-
skip_cleanup: true
87-
on:
88-
tags: true
75+
# - stage: deploy
76+
# script: skip
77+
# env: builds
78+
# deploy:
79+
# - provider: script
80+
# script: node scripts/git-builds.js
81+
# skip_cleanup: true
82+
# on:
83+
# all_branches: true
84+
# - stage: deploy
85+
# script: skip
86+
# env: publish
87+
# deploy:
88+
# - provider: script
89+
# script: node scripts/publish/publish.js
90+
# skip_cleanup: true
91+
# on:
92+
# tags: true
8993

9094

9195
before_install:

tests/e2e/tests/test/test-fail-watch.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import {
22
killAllProcesses,
33
waitForAnyProcessOutputToMatch,
4-
execAndWaitForOutputToMatch
4+
execAndWaitForOutputToMatch,
5+
exec
56
} from '../../utils/process';
67
import { expectToFail } from '../../utils/utils';
78
import { readFile, writeFile } from '../../utils/fs';
@@ -15,12 +16,16 @@ export default function () {
1516
return execAndWaitForOutputToMatch('ng', ['test'], karmaGoodRegEx)
1617
.then(() => readFile('src/app/app.component.spec.ts'))
1718
.then((data) => originalSpec = data)
19+
.then(() => console.log('## adding broken test ##'))
1820
// Trigger a failed rebuild, which shouldn't run tests again.
1921
.then(() => writeFile('src/app/app.component.spec.ts', '<p> definitely not typescript </p>'))
22+
.then(() => console.log('## waiting 10s for fail ##'))
2023
.then(() => expectToFail(() => waitForAnyProcessOutputToMatch(karmaGoodRegEx, 10000)))
24+
.then(() => console.log('## restoring test ##'))
2125
// Restore working spec.
2226
.then(() => writeFile('src/app/app.component.spec.ts', originalSpec))
23-
.then(() => waitForAnyProcessOutputToMatch(karmaGoodRegEx, 10000))
27+
.then(() => console.log('## waiting 10s for rebuild ##'))
28+
.then(() => waitForAnyProcessOutputToMatch(karmaGoodRegEx, 20000))
2429
.then(() => killAllProcesses(), (err: any) => {
2530
killAllProcesses();
2631
throw err;

0 commit comments

Comments
 (0)