cargdev/angular
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases Wiki Activity

test(service-worker): make mock implementations more similar to actual ones (#37922)

Browse Source 
This commit makes the mock implementations used is ServiceWorker tests
behave more similar to the actual ones.

PR Close #37922
This commit is contained in:
George Kalpakas
2020-07-06 16:55:37 +03:00
committed by atscott
parent cdba1d37a4
commit 324b6f1b1a
5 changed files with 258 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/service-worker/worker/testing/cache.ts
View File

@ -6,7 +6,8 @@
* found in the LICENSE file at https://angular.io/license
*/
import {MockRequest, MockResponse} from './fetch';
import {MockResponse} from './fetch';
import {normalizeUrl} from './utils';
export interface DehydratedResponse {
body: string|null;
@ -104,7 +105,7 @@ export class MockCache {
}
async 'delete'(request: RequestInfo, options?: CacheQueryOptions): Promise<boolean> {
let url = (typeof request === 'string' ? request : request.url);
let url = this.getRequestUrl(request);
if (this.cache.has(url)) {
this.cache.delete(url);
return true;
@ -127,10 +128,7 @@ export class MockCache {
}
async match(request: RequestInfo, options?: CacheQueryOptions): Promise<Response> {
let url = (typeof request === 'string' ? request : request.url);
if (url.startsWith(this.origin)) {
url = '/' + url.substr(this.origin.length);
}
let url = this.getRequestUrl(request);
// TODO: cleanup typings. Typescript doesn't know this can resolve to undefined.
let res = this.cache.get(url);
if (!res && options?.ignoreSearch) {
@ -150,8 +148,7 @@ export class MockCache {
if (request === undefined) {
return Array.from(this.cache.values());
}
const url = (typeof request === 'string' ? request : request.url);
const res = await this.match(url, options);
const res = await this.match(request, options);
if (res) {
return [res];
} else {
@ -160,7 +157,7 @@ export class MockCache {
}
async put(request: RequestInfo, response: Response): Promise<void> {
const url = (typeof request === 'string' ? request : request.url);
const url = this.getRequestUrl(request);
this.cache.set(url, response.clone());
// Even though the body above is cloned, consume it here because the
@ -190,6 +187,12 @@ export class MockCache {
return dehydrated;
}
/** Get the normalized URL from a `RequestInfo` value. */
private getRequestUrl(request: RequestInfo): string {
const url = typeof request === 'string' ? request : request.url;
return normalizeUrl(url, this.origin);
}
/** remove the query/hash part from a url*/
private stripQueryAndHash(url: string): string {
return url.replace(/[?#].*/, '');