Skip to content

Commit bf5cd5b

Browse files
jbedardjbedard
committed
test: use random port for ng serve e2e tests
1 parent 7ce88c7 commit bf5cd5b

11 files changed

Lines changed: 56 additions & 42 deletions

File tree

‎tests/legacy-cli/e2e/tests/basic/rebuild.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ import {
77
import { writeFile, writeMultipleFiles } from '../../utils/fs';
88
import { wait } from '../../utils/utils';
99
import fetch from 'node-fetch';
10+
import { findFreePort } from '../../utils/network';
1011

1112
const validBundleRegEx = / Compiled successfully./;
1213

13-
export default function () {
14+
export default async function () {
15+
const port = await findFreePort();
16+
1417
return (
15-
execAndWaitForOutputToMatch('ng', ['serve'], validBundleRegEx)
18+
execAndWaitForOutputToMatch('ng', ['serve', '--port', String(port)], validBundleRegEx)
1619
// Add a lazy module.
1720
.then(() => ng('generate', 'module', 'lazy', '--routing'))
1821
// Should trigger a rebuild with a new bundle.
@@ -136,7 +139,7 @@ export default function () {
136139
]),
137140
)
138141
.then(() => wait(2000))
139-
.then(() => fetch('http://localhost:4200/main.js'))
142+
.then(() => fetch(`http://localhost:${port}/main.js`))
140143
.then((response) => response.text())
141144
.then((body) => {
142145
if (!body.match(/\$\$_E2E_GOLDEN_VALUE_1/)) {
@@ -158,7 +161,7 @@ export default function () {
158161
]),
159162
)
160163
.then(() => wait(2000))
161-
.then(() => fetch('http://localhost:4200/main.js'))
164+
.then(() => fetch(`http://localhost:${port}/main.js`))
162165
.then((response) => response.text())
163166
.then((body) => {
164167
if (!body.match(/testingTESTING123/)) {
@@ -174,7 +177,7 @@ export default function () {
174177
]),
175178
)
176179
.then(() => wait(2000))
177-
.then(() => fetch('http://localhost:4200/main.js'))
180+
.then(() => fetch(`http://localhost:${port}/main.js`))
178181
.then((response) => response.text())
179182
.then((body) => {
180183
if (!body.match(/color:\s?blue/)) {

‎tests/legacy-cli/e2e/tests/basic/serve.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ import { ngServe } from '../../utils/project';
55
export default async function () {
66
try {
77
// Serve works without HMR
8-
await ngServe('--no-hmr');
9-
await verifyResponse();
8+
const noHmrPort = await ngServe('--no-hmr');
9+
await verifyResponse(noHmrPort);
1010
await killAllProcesses();
1111

1212
// Serve works with HMR
13-
await ngServe('--hmr');
14-
await verifyResponse();
13+
const hmrPort = await ngServe('--hmr');
14+
await verifyResponse(hmrPort);
1515
} finally {
1616
await killAllProcesses();
1717
}
1818
}
1919

20-
async function verifyResponse(): Promise<void> {
21-
const response = await fetch('http://localhost:4200/');
20+
async function verifyResponse(port: number): Promise<void> {
21+
const response = await fetch(`http://localhost:${port}/`);
2222

2323
if (!/<app-root><\/app-root>/.test(await response.text())) {
2424
throw new Error('Response does not match expected value.');

‎tests/legacy-cli/e2e/tests/commands/serve/serve-path.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ import fetch from 'node-fetch';
33
import { killAllProcesses } from '../../../utils/process';
44
import { ngServe } from '../../../utils/project';
55

6-
export default function () {
6+
export default async function () {
77
// TODO(architect): Delete this test. It is now in devkit/build-angular.
88

9+
const port = await ngServe('--serve-path', 'test/');
10+
911
return Promise.resolve()
10-
.then(() => ngServe('--serve-path', 'test/'))
11-
.then(() => fetch('http://localhost:4200/test', { headers: { 'Accept': 'text/html' } }))
12+
.then(() => fetch(`http://localhost:${port}/test`, { headers: { 'Accept': 'text/html' } }))
1213
.then(async (response) => {
1314
assert.strictEqual(response.status, 200);
1415
assert.match(await response.text(), /<app-root><\/app-root>/);
1516
})
16-
.then(() => fetch('http://localhost:4200/test/abc', { headers: { 'Accept': 'text/html' } }))
17+
.then(() => fetch(`http://localhost:${port}/test/abc`, { headers: { 'Accept': 'text/html' } }))
1718
.then(async (response) => {
1819
assert.strictEqual(response.status, 200);
1920
assert.match(await response.text(), /<app-root><\/app-root>/);

‎tests/legacy-cli/e2e/tests/misc/fallback.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function () {
1212
return (
1313
Promise.resolve()
1414
.then(() => ngServe())
15-
.then(() => fetch('http://localhost:4200/', { headers: { 'Accept': 'text/html' } }))
15+
.then((port) => fetch(`http://localhost:${port}/`, { headers: { 'Accept': 'text/html' } }))
1616
.then(async (response) => {
1717
assert.strictEqual(response.status, 200);
1818
assert.match(await response.text(), /<app-root><\/app-root>/);
@@ -27,7 +27,7 @@ export default function () {
2727
}),
2828
)
2929
.then(() => ngServe())
30-
.then(() => fetch('http://localhost:4200/', { headers: { 'Accept': 'text/html' } }))
30+
.then((port) => fetch(`http://localhost:${port}/`, { headers: { 'Accept': 'text/html' } }))
3131
.then(async (response) => {
3232
assert.strictEqual(response.status, 200);
3333
assert.match(await response.text(), /<app-root><\/app-root>/);

‎tests/legacy-cli/e2e/tests/misc/proxy-config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default function () {
3434
return Promise.resolve()
3535
.then(() => writeFile(proxyConfigFile, JSON.stringify(proxyConfig, null, 2)))
3636
.then(() => ngServe('--proxy-config', proxyConfigFile))
37-
.then(() => fetch('http://localhost:4200/api/test'))
37+
.then((port) => fetch(`http://localhost:${port}/api/test`))
3838
.then(async (response) => {
3939
assert.strictEqual(response.status, 200);
4040
assert.match(await response.text(), /TEST_API_RETURN/);

‎tests/legacy-cli/e2e/tests/misc/public-host.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ export default function () {
1111
.filter((ni) => ni?.family === 'IPv4' && !ni?.internal)
1212
.map((ni) => ni!.address)
1313
.shift();
14-
const publicHost = `${firstLocalIp}:4200`;
14+
const publicHost = `${firstLocalIp}`;
1515
const localAddress = `http://${publicHost}`;
1616

1717
return Promise.resolve()
1818
.then(() => ngServe('--host=0.0.0.0', `--public-host=${publicHost}`))
19-
.then(() => fetch(localAddress))
19+
.then((port) => fetch(`${localAddress}:${port}`))
2020
.then((response) => response.text())
2121
.then((body) => {
2222
if (!body.match(/<app-root><\/app-root>/)) {
@@ -25,7 +25,7 @@ export default function () {
2525
})
2626
.then(() => killAllProcesses())
2727
.then(() => ngServe('--host=0.0.0.0', `--disable-host-check`))
28-
.then(() => fetch(localAddress))
28+
.then((port) => fetch(`${localAddress}:${port}`))
2929
.then((response) => response.text())
3030
.then((body) => {
3131
if (!body.match(/<app-root><\/app-root>/)) {
@@ -35,7 +35,7 @@ export default function () {
3535

3636
.then(() => killAllProcesses())
3737
.then(() => ngServe('--host=0.0.0.0', `--public-host=${localAddress}`))
38-
.then(() => fetch(localAddress))
38+
.then((port) => fetch(`${localAddress}:${port}`))
3939
.then((response) => response.text())
4040
.then((body) => {
4141
if (!body.match(/<app-root><\/app-root>/)) {
@@ -44,7 +44,7 @@ export default function () {
4444
})
4545
.then(() => killAllProcesses())
4646
.then(() => ngServe('--host=0.0.0.0', `--public-host=${firstLocalIp}`))
47-
.then(() => fetch(localAddress))
47+
.then((port) => fetch(`${localAddress}:${port}`))
4848
.then((response) => response.text())
4949
.then((body) => {
5050
if (!body.match(/<app-root><\/app-root>/)) {

‎tests/legacy-cli/e2e/tests/misc/ssl-default.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export default async function () {
88
// TODO(architect): Delete this test. It is now in devkit/build-angular.
99

1010
try {
11-
await ngServe('--ssl', 'true');
11+
const port = await ngServe('--ssl', 'true');
1212

13-
const response = await fetch('https://localhost:4200/', {
13+
const response = await fetch(`https://localhost:${port}/`, {
1414
agent: new Agent({ rejectUnauthorized: false }),
1515
});
1616

‎tests/legacy-cli/e2e/tests/misc/ssl-with-cert.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default async function () {
99
// TODO(architect): Delete this test. It is now in devkit/build-angular.
1010

1111
try {
12-
await ngServe(
12+
const port = await ngServe(
1313
'--ssl',
1414
'true',
1515
'--ssl-key',
@@ -18,7 +18,7 @@ export default async function () {
1818
assetDir('ssl/server.crt'),
1919
);
2020

21-
const response = await fetch('https://localhost:4200/', {
21+
const response = await fetch(`https://localhost:${port}/`, {
2222
agent: new Agent({ rejectUnauthorized: false }),
2323
});
2424

‎tests/legacy-cli/e2e/utils/network.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { AddressInfo, createServer } from 'net';
2+
3+
export function findFreePort() {
4+
return new Promise<number>((resolve, reject) => {
5+
const srv = createServer();
6+
srv.once('listening', () => {
7+
const port = (srv.address() as AddressInfo).port;
8+
srv.close((e) => (e ? reject(e) : resolve(port)));
9+
});
10+
srv.once('error', (e) => srv.close(() => reject(e)));
11+
srv.listen();
12+
});
13+
}

‎tests/legacy-cli/e2e/utils/project.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { packages } from '../../../../lib/packages';
66
import { getGlobalVariable } from './env';
77
import { prependToFile, readFile, replaceInFile, writeFile } from './fs';
88
import { gitCommit } from './git';
9+
import { findFreePort } from './network';
910
import { installWorkspacePackages } from './packages';
1011
import { exec, execAndWaitForOutputToMatch, git, ng } from './process';
1112

@@ -23,8 +24,16 @@ export function updateTsConfig(fn: (json: any) => any | void) {
2324
return updateJsonFile('tsconfig.json', fn);
2425
}
2526

26-
export function ngServe(...args: string[]) {
27-
return execAndWaitForOutputToMatch('ng', ['serve', ...args], / Compiled successfully./);
27+
export async function ngServe(...args: string[]) {
28+
const port = await findFreePort();
29+
30+
await execAndWaitForOutputToMatch(
31+
'ng',
32+
['serve', '--port', String(port), ...args],
33+
/ Compiled successfully./,
34+
);
35+
36+
return port;
2837
}
2938
export async function prepareProjectForE2e(name: string) {
3039
const argv: yargsParser.Arguments = getGlobalVariable('argv');

0 commit comments

Comments
 (0)