honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(service-worker): make it easy to use a different SW scope in tests (#27080) 

PR Close #27080
This commit is contained in:
George Kalpakas 2019-03-20 23:29:16 +02:00 committed by Matias Niemelä
parent e721c08c7f
commit 84baa0bb08
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/service-worker/worker/testing/scope.ts
View File

@ -18,8 +18,6 @@ import {MockServerState, MockServerStateBuilder} from './mock';
const EMPTY_SERVER_STATE = new MockServerStateBuilder().build(); const EMPTY_SERVER_STATE = new MockServerStateBuilder().build();
const MOCK_ORIGIN = 'http://localhost/';
export class MockClient { export class MockClient {
queue = new Subject<Object>(); queue = new Subject<Object>();
@ -35,10 +33,12 @@ export class MockClient {
export class SwTestHarnessBuilder { export class SwTestHarnessBuilder {
private server = EMPTY_SERVER_STATE; private server = EMPTY_SERVER_STATE;
private caches = new MockCacheStorage(MOCK_ORIGIN); private caches = new MockCacheStorage(this.origin);
constructor(private origin = 'http://localhost/') {}
withCacheState(cache: string): SwTestHarnessBuilder { withCacheState(cache: string): SwTestHarnessBuilder {
this.caches = new MockCacheStorage(MOCK_ORIGIN, cache); this.caches = new MockCacheStorage(this.origin, cache);
return this; return this;
} }
@ -47,7 +47,7 @@ export class SwTestHarnessBuilder {
return this; return this;
} }
build(): SwTestHarness { return new SwTestHarness(this.server, this.caches); } build(): SwTestHarness { return new SwTestHarness(this.server, this.caches, this.origin); }
} }
export class MockClients implements Clients { export class MockClients implements Clients {
@ -88,7 +88,7 @@ export class SwTestHarness implements ServiceWorkerGlobalScope, Adapter, Context
active: { active: {
postMessage: (msg: any) => { this.selfMessageQueue.push(msg); }, postMessage: (msg: any) => { this.selfMessageQueue.push(msg); },
}, },
scope: MOCK_ORIGIN, scope: this.origin,
showNotification: (title: string, options: Object) => { showNotification: (title: string, options: Object) => {
this.notifications.push({title, options}); this.notifications.push({title, options});
}, },
@ -114,7 +114,8 @@ export class SwTestHarness implements ServiceWorkerGlobalScope, Adapter, Context
fired: boolean, fired: boolean,
}[] = []; }[] = [];
constructor(private server: MockServerState, readonly caches: MockCacheStorage) { constructor(
private server: MockServerState, readonly caches: MockCacheStorage, private origin: string) {
this.time = Date.now(); this.time = Date.now();
const baseHref = new URL(this.registration.scope).pathname; const baseHref = new URL(this.registration.scope).pathname;
this.cacheNamePrefix = 'ngsw:' + baseHref; this.cacheNamePrefix = 'ngsw:' + baseHref;
@ -153,14 +154,14 @@ export class SwTestHarness implements ServiceWorkerGlobalScope, Adapter, Context
fetch(req: string|Request): Promise<Response> { fetch(req: string|Request): Promise<Response> {
if (typeof req === 'string') { if (typeof req === 'string') {
if (req.startsWith(MOCK_ORIGIN)) { if (req.startsWith(this.origin)) {
req = '/' + req.substr(MOCK_ORIGIN.length); req = '/' + req.substr(this.origin.length);
} }
return this.server.fetch(new MockRequest(req)); return this.server.fetch(new MockRequest(req));
} else { } else {
const mockReq = req.clone() as MockRequest; const mockReq = req.clone() as MockRequest;
if (mockReq.url.startsWith(MOCK_ORIGIN)) { if (mockReq.url.startsWith(this.origin)) {
mockReq.url = '/' + mockReq.url.substr(MOCK_ORIGIN.length); mockReq.url = '/' + mockReq.url.substr(this.origin.length);
} }
return this.server.fetch(mockReq); return this.server.fetch(mockReq);
} }