Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-18 20:02:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(@angular-devkit/build-angular): add dev-server execute and fetch unit test helper

Browse Source 
This change extracts common test code into a helper function to reduce complexity of the dev-server builder unit tests.
This commit is contained in:
Charles Lyding 2021-03-06 09:17:41 -05:00 committed by Filipe Silva
parent 06a354fb93
commit a51eb6e864
4 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/angular_devkit/build_angular/BUILD.bazel
View File

@ -266,6 +266,7 @@ ts_library(
"//packages/angular_devkit/architect/testing",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
"@npm//@types/node-fetch",
"@npm//rxjs",
],
)

20
packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.ts
View File

@ -5,9 +5,8 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
import { mergeMap, take, timeout } from 'rxjs/operators';
import { serveWebpackBrowser } from '../../index';
import { executeOnceAndFetch } from '../execute-fetch';
import {
BASE_OPTIONS,
DEV_SERVER_BUILDER_INFO,
@ -41,21 +40,10 @@ describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => {
...BASE_OPTIONS,
});
await harness
.execute()
.pipe(
timeout(39000),
mergeMap(async ({ result }) => {
expect(result?.success).toBeTrue();
const { result, response } = await executeOnceAndFetch(harness, '/');
if (result?.success) {
const response = await fetch(`${result.baseUrl}index.html`);
expect(await response.text()).toContain(`body{color:#000;}`);
}
}),
take(1),
)
.toPromise();
expect(result?.success).toBeTrue();
expect(await response?.text()).toContain('body{color:#000;}');
});
});
});

38
packages/angular_devkit/build_angular/src/dev-server/tests/execute-fetch.ts Normal file
View File

@ -0,0 +1,38 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import fetch, { RequestInit, Response } from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
import { mergeMap, take, timeout } from 'rxjs/operators';
import { URL } from 'url';
import {
BuilderHarness,
BuilderHarnessExecutionOptions,
BuilderHarnessExecutionResult,
} from '../../testing/builder-harness';
export async function executeOnceAndFetch<T>(
harness: BuilderHarness<T>,
url: string,
options?: Partial<BuilderHarnessExecutionOptions> & { request?: RequestInit },
): Promise<BuilderHarnessExecutionResult & { response?: Response }> {
return harness
.execute()
.pipe(
timeout(30000),
mergeMap(async (executionResult) => {
let response = undefined;
if (executionResult.result?.success) {
const resolvedUrl = new URL(url, executionResult.result.baseUrl as string);
response = await fetch(resolvedUrl, options?.request);
}
return { ...executionResult, response };
}),
take(1),
)
.toPromise();
}

61
packages/angular_devkit/build_angular/src/dev-server/tests/options/allowed-hosts_spec.ts
View File

@ -5,12 +5,10 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
import { mergeMap, take, timeout } from 'rxjs/operators';
import { serveWebpackBrowser } from '../../index';
import { executeOnceAndFetch } from '../execute-fetch';
import {
BASE_OPTIONS,
BUILD_TIMEOUT,
DEV_SERVER_BUILDER_INFO,
describeBuilder,
setupBrowserTarget,
@ -32,21 +30,12 @@ describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => {
...BASE_OPTIONS,
});
await harness
.execute()
.pipe(
timeout(BUILD_TIMEOUT),
mergeMap(async ({ result }) => {
expect(result?.success).toBeTrue();
const { result, response } = await executeOnceAndFetch(harness, '/', {
request: { headers: FETCH_HEADERS },
});
if (result?.success) {
const response = await fetch(`${result.baseUrl}`, { headers: FETCH_HEADERS });
expect(await response.text()).toBe('Invalid Host header');
}
}),
take(1),
)
.toPromise();
expect(result?.success).toBeTrue();
expect(await response?.text()).toBe('Invalid Host header');
});
it('does not allow an invalid host when option is an empty array', async () => {
@ -55,21 +44,12 @@ describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => {
allowedHosts: [],
});
await harness
.execute()
.pipe(
timeout(BUILD_TIMEOUT),
mergeMap(async ({ result }) => {
expect(result?.success).toBeTrue();
const { result, response } = await executeOnceAndFetch(harness, '/', {
request: { headers: FETCH_HEADERS },
});
if (result?.success) {
const response = await fetch(`${result.baseUrl}`, { headers: FETCH_HEADERS });
expect(await response.text()).toBe('Invalid Host header');
}
}),
take(1),
)
.toPromise();
expect(result?.success).toBeTrue();
expect(await response?.text()).toBe('Invalid Host header');
});
it('allows a host when specified in the option', async () => {
@ -78,21 +58,12 @@ describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => {
allowedHosts: ['example.com'],
});
await harness
.execute()
.pipe(
timeout(BUILD_TIMEOUT),
mergeMap(async ({ result }) => {
expect(result?.success).toBeTrue();
const { result, response } = await executeOnceAndFetch(harness, '/', {
request: { headers: FETCH_HEADERS },
});
if (result?.success) {
const response = await fetch(`${result.baseUrl}`, { headers: FETCH_HEADERS });
expect(await response.text()).toContain('<title>');
}
}),
take(1),
)
.toPromise();
expect(result?.success).toBeTrue();
expect(await response?.text()).toContain('<title>');
});
});
});