refactor(service-worker): minor mocks refactoring (#24162)

PR Close #24162

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;

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<void> { return; }
 
-  async getRegistration(): Promise<ServiceWorkerRegistration> { 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<ServiceWorkerRegistration> {
+    return this.mockRegistration as any;
   }
 
-  get mockRegistration(): Promise<MockServiceWorkerRegistration> {
-    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 {