Skip to content

Commit 9f911a6

Browse files
committed
fixup! test: run e2e tests on pre-compiled packages
1 parent d1e23f5 commit 9f911a6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.circleci/dynamic_config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -235,23 +235,23 @@ jobs:
235235
- run:
236236
name: Execute CLI E2E Tests with NPM
237237
command: |
238-
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
238+
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"
239239
- when:
240240
condition:
241241
equal: ['esbuild', << parameters.subset >>]
242242
steps:
243243
- run:
244244
name: Execute CLI E2E Tests Subset with Esbuild
245245
command: |
246-
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"
246+
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"
247247
- when:
248248
condition:
249249
equal: ['yarn', << parameters.subset >>]
250250
steps:
251251
- run:
252252
name: Execute CLI E2E Tests Subset with Yarn
253253
command: |
254-
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/**}"
254+
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/**}"
255255
- fail_fast
256256

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

@@ -374,7 +374,7 @@ jobs:
374374
name: Execute E2E Tests
375375
command: |
376376
mkdir X:/ramdisk/e2e-main
377-
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
377+
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"
378378
- fail_fast
379379

380380
workflows:

tests/legacy-cli/e2e_runner.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ function printFooter(testName: string, type: 'setup' | 'initializer' | 'test', s
323323

324324
// Collect the packages passed as arguments and return as {package-name => pkg-path}
325325
async function findPackageTars(): Promise<{ [pkg: string]: string }> {
326-
const pkgs: string[] = (getGlobalVariable('argv').package as string[]).flatMap((p) =>
327-
glob.sync(p, { realpath: true }),
328-
);
326+
const pkgs: string[] = (
327+
(getGlobalVariable('argv').package as string[]) || './dist/_*.tgz'
328+
).flatMap((p) => glob.sync(p, { realpath: true }));
329329

330330
const pkgJsons = await Promise.all(pkgs.map((pkg) => extractFile(pkg, './package/package.json')));
331331

0 commit comments

Comments
 (0)