From e530502a4d4a77c9b1759c8e2562f67c4c72cdd4 Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Wed, 27 Jul 2022 10:57:43 -0700 Subject: [PATCH 1/2] test: use random e2e test ports --- .../build_angular/src/builders/dev-server/specs/works_spec.ts | 2 +- tests/legacy-cli/e2e/utils/project.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/specs/works_spec.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/specs/works_spec.ts index 90ef75c2274b..edac384cca34 100644 --- a/packages/angular_devkit/build_angular/src/builders/dev-server/specs/works_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/dev-server/specs/works_spec.ts @@ -34,7 +34,7 @@ describe('Dev Server Builder', () => { expect(output.success).toBe(true); // When webpack-dev-server doesn't have `contentBase: false`, this will serve the repo README. - const response = await fetch('http://localhost:4200/README.md', { + const response = await fetch(`http://localhost:${output.port}/README.md`, { headers: { 'Accept': 'text/html', }, diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts index 200f14dcfbce..550e560a45d4 100644 --- a/tests/legacy-cli/e2e/utils/project.ts +++ b/tests/legacy-cli/e2e/utils/project.ts @@ -165,9 +165,11 @@ export function useCIDefaults(projectName = 'test-project') { const appTargets = project.targets || project.architect; appTargets.build.options.progress = false; appTargets.test.options.progress = false; - // Disable auto-updating webdriver in e2e. if (appTargets.e2e) { + // Disable auto-updating webdriver in e2e. appTargets.e2e.options.webdriverUpdate = false; + // Use a random port in e2e. + appTargets.e2e.options.port = 0; } }); } From 2844798dd61505a10a99f3da2f5473338c8bc1fc Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Wed, 27 Jul 2022 21:41:35 -0700 Subject: [PATCH 2/2] test: use random ng serve ports --- tests/legacy-cli/e2e/utils/project.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts index 550e560a45d4..8a06b02b0eae 100644 --- a/tests/legacy-cli/e2e/utils/project.ts +++ b/tests/legacy-cli/e2e/utils/project.ts @@ -171,6 +171,12 @@ export function useCIDefaults(projectName = 'test-project') { // Use a random port in e2e. appTargets.e2e.options.port = 0; } + + if (appTargets.serve) { + // Use a random port in serve. + appTargets.serve.options ??= {}; + appTargets.serve.options.port = 0; + } }); }