From dbfb6b9d45f6c4e3e662928d065f0420beca66f6 Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Mon, 28 May 2018 16:27:07 +0300 Subject: [PATCH] refactor(service-worker): minor mocks refactoring (#24162) PR Close #24162 --- .../service-worker/test/integration_spec.ts | 2 +- packages/service-worker/testing/mock.ts | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/service-worker/test/integration_spec.ts b/packages/service-worker/test/integration_spec.ts index acd1ed0b81..93cf7021f7 100644 --- a/packages/service-worker/test/integration_spec.ts +++ b/packages/service-worker/test/integration_spec.ts @@ -90,7 +90,7 @@ const serverUpdate = mock.messages.subscribe(msg => { scope.handleMessage(msg, 'default'); }); mock.setupSw(); - reg = await mock.mockRegistration; + reg = mock.mockRegistration !; await Promise.all(scope.handleFetch(new MockRequest('/only.txt'), 'default')); await driver.initialized; diff --git a/packages/service-worker/testing/mock.ts b/packages/service-worker/testing/mock.ts index 879a1f9d8b..4c1cd60355 100644 --- a/packages/service-worker/testing/mock.ts +++ b/packages/service-worker/testing/mock.ts @@ -11,9 +11,8 @@ import {Subject} from 'rxjs'; export class MockServiceWorkerContainer { private onControllerChange: Function[] = []; private onMessage: Function[] = []; - private registration: MockServiceWorkerRegistration|null = null; + mockRegistration: MockServiceWorkerRegistration|null = null; controller: MockServiceWorker|null = null; - messages = new Subject(); addEventListener(event: 'controllerchange'|'message', handler: Function) { @@ -34,16 +33,14 @@ export class MockServiceWorkerContainer { async register(url: string): Promise { return; } - async getRegistration(): Promise { return this.registration as any; } - - setupSw(url: string = '/ngsw-worker.js'): void { - this.registration = new MockServiceWorkerRegistration(); - this.controller = new MockServiceWorker(this, url); - this.onControllerChange.forEach(onChange => onChange(this.controller)); + async getRegistration(): Promise { + return this.mockRegistration as any; } - get mockRegistration(): Promise { - return Promise.resolve(this.registration !); + setupSw(url: string = '/ngsw-worker.js'): void { + this.mockRegistration = new MockServiceWorkerRegistration(); + this.controller = new MockServiceWorker(this, url); + this.onControllerChange.forEach(onChange => onChange(this.controller)); } sendMessage(value: Object): void {