Skip to content

Commit fb47aef

Browse files
committed
fixup! test: run e2e tests on pre-compiled packages
1 parent 5f4344c commit fb47aef

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

.circleci/dynamic_config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,23 +239,23 @@ jobs:
239239
- run:
240240
name: Execute CLI E2E Tests with NPM
241241
command: |
242-
node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --tmpdir=/mnt/ramdisk/e2e --ignore="tests/misc/browsers.ts" --package ./dist/_*.tgz
242+
node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --tmpdir=/mnt/ramdisk/e2e --ignore="tests/misc/browsers.ts"
243243
- when:
244244
condition:
245245
equal: ['esbuild', << parameters.subset >>]
246246
steps:
247247
- run:
248248
name: Execute CLI E2E Tests Subset with Esbuild
249249
command: |
250-
node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --esbuild --tmpdir=/mnt/ramdisk/e2e --package ./dist/_*.tgz --glob="{tests/basic/**,tests/build/prod-build.ts,tests/build/relative-sourcemap.ts,tests/build/styles/scss.ts,tests/build/styles/include-paths.ts,tests/commands/add/add-pwa.ts}" --ignore="tests/basic/{environment,rebuild,serve,scripts-array}.ts"
250+
node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --esbuild --tmpdir=/mnt/ramdisk/e2e --glob="{tests/basic/**,tests/build/prod-build.ts,tests/build/relative-sourcemap.ts,tests/build/styles/scss.ts,tests/build/styles/include-paths.ts,tests/commands/add/add-pwa.ts}" --ignore="tests/basic/{environment,rebuild,serve,scripts-array}.ts"
251251
- when:
252252
condition:
253253
equal: ['yarn', << parameters.subset >>]
254254
steps:
255255
- run:
256256
name: Execute CLI E2E Tests Subset with Yarn
257257
command: |
258-
node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --yarn --tmpdir=/mnt/ramdisk/e2e --package ./dist/_*.tgz --glob="{tests/basic/**,tests/update/**,tests/commands/add/**}"
258+
node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --yarn --tmpdir=/mnt/ramdisk/e2e --glob="{tests/basic/**,tests/update/**,tests/commands/add/**}"
259259
- fail_fast
260260

261261
test-browsers:
@@ -275,7 +275,7 @@ jobs:
275275
# Waits for the Saucelabs tunnel to be ready. This ensures that we don't run tests
276276
# too early without Saucelabs not being ready.
277277
- run: ./scripts/saucelabs/wait-for-tunnel.sh
278-
- run: node ./tests/legacy-cli/run_e2e --package ./dist/_*.tgz --glob="tests/misc/browsers.ts"
278+
- run: node ./tests/legacy-cli/run_e2e --glob="tests/misc/browsers.ts"
279279
- run: ./scripts/saucelabs/stop-tunnel.sh
280280
- fail_fast
281281

@@ -398,7 +398,7 @@ jobs:
398398
name: Execute E2E Tests
399399
command: |
400400
mkdir X:/ramdisk/e2e-main
401-
node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX --tmpdir=X:/ramdisk/e2e-main --ignore="tests/misc/browsers.ts" --package ./dist/_*.tgz
401+
node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX --tmpdir=X:/ramdisk/e2e-main --ignore="tests/misc/browsers.ts"
402402
- fail_fast
403403

404404
workflows:

tests/legacy-cli/e2e_runner.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ const argv = yargsParser(process.argv.slice(2), {
5858
'dot-notation': false,
5959
'camel-case-expansion': false,
6060
},
61+
default: {
62+
'package': ['./dist/_*.tgz'],
63+
},
6164
});
6265

6366
/**

0 commit comments

Comments
 (0)