Skip to content

Commit 445149f

Browse files
jbedardjbedard
committed
test: use random port for e2e express http server tests
1 parent bf5cd5b commit 445149f

7 files changed

Lines changed: 56 additions & 21 deletions

File tree

‎tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,17 @@ export default async function () {
5959
await ng('e2e', `--configuration=${lang}`, '--port=0');
6060

6161
// Execute Application E2E tests for a production build without dev server
62-
const server = externalServer(outputPath, (baseHrefs[lang] as string) || '/');
62+
const { server, port, url } = await externalServer(
63+
outputPath,
64+
(baseHrefs[lang] as string) || '/',
65+
);
6366
try {
6467
await ng(
6568
'e2e',
69+
`--port=${port}`,
6670
`--configuration=${lang}`,
6771
'--dev-server-target=',
68-
`--base-url=http://localhost:4200${baseHrefs[lang] || '/'}`,
72+
`--base-url=${url}`,
6973
);
7074
} finally {
7175
server.close();
@@ -89,13 +93,17 @@ export default async function () {
8993
await ng('e2e', `--configuration=${lang}`, '--port=0');
9094

9195
// Execute Application E2E tests for a production build without dev server
92-
const server = externalServer(outputPath, '/test' + (baseHrefs[lang] || '/'));
96+
const { server, port, url } = await externalServer(
97+
outputPath,
98+
'/test' + (baseHrefs[lang] || '/'),
99+
);
93100
try {
94101
await ng(
95102
'e2e',
103+
`--port=${port}`,
96104
`--configuration=${lang}`,
97105
'--dev-server-target=',
98-
`--base-url=http://localhost:4200/test${baseHrefs[lang] || '/'}`,
106+
`--base-url=${url}`,
99107
);
100108
} finally {
101109
server.close();

‎tests/legacy-cli/e2e/tests/i18n/ivy-localize-es2015.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@ export default async function () {
4040
await ng('e2e', `--configuration=${lang}`, '--port=0');
4141

4242
// Execute Application E2E tests for a production build without dev server
43-
const server = externalServer(outputPath, `/${lang}/`);
43+
const { server, port, url } = await externalServer(outputPath, `/${lang}/`);
4444
try {
4545
await ng(
4646
'e2e',
47+
`--port=${port}`,
4748
`--configuration=${lang}`,
4849
'--dev-server-target=',
49-
`--base-url=http://localhost:4200/${lang}/`,
50+
`--base-url=${url}`,
5051
);
5152
} finally {
5253
server.close();

‎tests/legacy-cli/e2e/tests/i18n/ivy-localize-es5.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,14 @@ export default async function () {
4444
await ng('e2e', `--configuration=${lang}`, '--port=0');
4545

4646
// Execute Application E2E tests for a production build without dev server
47-
const server = externalServer(outputPath, `/${lang}/`);
47+
const { server, port, url } = await externalServer(outputPath, `/${lang}/`);
4848
try {
4949
await ng(
5050
'e2e',
51+
`--port=${port}`,
5152
`--configuration=${lang}`,
5253
'--dev-server-target=',
53-
`--base-url=http://localhost:4200/${lang}/`,
54+
`--base-url=${url}`,
5455
);
5556
} finally {
5657
server.close();

‎tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data-augment.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ export default async function () {
4343
await ng('e2e', `--configuration=${lang}`, '--port=0');
4444

4545
// Execute Application E2E tests for a production build without dev server
46-
const server = externalServer(outputPath, `/${lang}/`);
46+
const { server, port, url } = await externalServer(outputPath, `/${lang}/`);
4747
try {
4848
await ng(
4949
'e2e',
50+
`--port=${port}`,
5051
`--configuration=${lang}`,
5152
'--dev-server-target=',
52-
`--base-url=http://localhost:4200/${lang}/`,
53+
`--base-url=${url}`,
5354
);
5455
} finally {
5556
server.close();

‎tests/legacy-cli/e2e/tests/i18n/ivy-localize-server.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import express from 'express';
22
import { join } from 'path';
33
import { getGlobalVariable } from '../../utils/env';
44
import { appendToFile, expectFileToMatch, writeFile } from '../../utils/fs';
5+
import { findFreePort } from '../../utils/network';
56
import { installWorkspacePackages } from '../../utils/packages';
67
import { ng } from '../../utils/process';
78
import { updateJsonFile } from '../../utils/project';
@@ -13,6 +14,7 @@ const snapshots = require('../../ng-snapshot/package.json');
1314
export default async function () {
1415
// TODO: Re-enable pending further Ivy/Universal/i18n work
1516
return;
17+
const port = await findFreePort();
1618

1719
// Setup i18n tests and config.
1820
await setupI18nConfig();
@@ -113,10 +115,10 @@ export default async function () {
113115
const { i18nApp } = (await import(serverBundle)) as {
114116
i18nApp(locale: string): express.Express;
115117
};
116-
const server = i18nApp(lang).listen(4200, 'localhost');
118+
const server = i18nApp(lang).listen(port, 'localhost');
117119
try {
118120
// Execute without a devserver.
119-
await ng('e2e', `--configuration=${lang}`, '--dev-server-target=');
121+
await ng('e2e', `--port=${port}`, `--configuration=${lang}`, '--dev-server-target=');
120122
} finally {
121123
server.close();
122124
}

‎tests/legacy-cli/e2e/tests/i18n/ivy-localize-serviceworker.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ import {
88
replaceInFile,
99
writeFile,
1010
} from '../../utils/fs';
11+
import { findFreePort } from '../../utils/network';
1112
import { installPackage } from '../../utils/packages';
1213
import { ng } from '../../utils/process';
1314
import { updateJsonFile } from '../../utils/project';
1415
import { expectToFail } from '../../utils/utils';
1516
import { readNgVersion } from '../../utils/version';
17+
import { externalServer } from './setup';
1618

1719
export default async function () {
1820
// TEMP: disable pending i18n updates
@@ -154,9 +156,7 @@ export default async function () {
154156
await expectFileToExist(`${baseDir}/${lang}/ngsw.json`);
155157

156158
// Ivy i18n doesn't yet work with `ng serve` so we must use a separate server.
157-
const app = express();
158-
app.use(express.static(resolve(baseDir, lang)));
159-
const server = app.listen(4200, 'localhost');
159+
const { server, port } = await externalServer(resolve(baseDir, lang));
160160
try {
161161
// Add E2E test for locale
162162
await writeFile(
@@ -180,7 +180,7 @@ export default async function () {
180180
);
181181

182182
// Execute without a devserver.
183-
await ng('e2e', '--dev-server-target=');
183+
await ng('e2e', '--dev-server-target=', `--port=${port}`);
184184
} finally {
185185
server.close();
186186
}

‎tests/legacy-cli/e2e/tests/i18n/setup.ts‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ import {
99
replaceInFile,
1010
writeFile,
1111
} from '../../utils/fs';
12+
import { findFreePort } from '../../utils/network';
1213
import { installPackage } from '../../utils/packages';
1314
import { ng } from '../../utils/process';
1415
import { updateJsonFile } from '../../utils/project';
15-
import { expectToFail } from '../../utils/utils';
1616
import { readNgVersion } from '../../utils/version';
17+
import { Server } from 'http';
18+
import { AddressInfo } from 'net';
1719

1820
// Configurations for each locale.
1921
export const baseDir = 'dist/test-project';
@@ -67,13 +69,33 @@ export const langTranslations = [
6769
];
6870
export const sourceLocale = langTranslations[0].lang;
6971

70-
export const externalServer = (outputPath: string, baseUrl = '/') => {
72+
export interface ExternalServer {
73+
readonly server: Server;
74+
readonly port: number;
75+
readonly url: string;
76+
}
77+
78+
/**
79+
* Create an `express` `http.Server` listening on a random port.
80+
*
81+
* Call .close() on the server return value to close the server.
82+
*/
83+
export async function externalServer(outputPath: string, baseUrl = '/'): Promise<ExternalServer> {
7184
const app = express();
7285
app.use(baseUrl, express.static(resolve(outputPath)));
7386

74-
// call .close() on the return value to close the server.
75-
return app.listen(4200, 'localhost');
76-
};
87+
return new Promise((resolve) => {
88+
const server = app.listen(0, 'localhost', () => {
89+
const { port } = server.address() as AddressInfo;
90+
91+
resolve({
92+
server,
93+
port,
94+
url: `http://localhost:${port}${baseUrl}`,
95+
});
96+
});
97+
});
98+
}
7799

78100
export const formats = {
79101
'xlf': {

0 commit comments

Comments
 (0)