Modify messaging tests to be enabled on Safari.

Author: yifanyang

packages/messaging/src/controllers/window-controller.ts

@@ -75,7 +75,7 @@ export class WindowController extends ControllerInterface {
    */
   getToken(): Promise<string | null> {
     // Check that the required API's are available
-    if (!this.isSupported_()) {
+    if (!WindowController.isSupported_()) {
       return Promise.reject(
         errorFactory.create(ERROR_CODES.UNSUPPORTED_BROWSER)
       );
@@ -391,7 +391,7 @@ export class WindowController extends ControllerInterface {
    */
   // Visible for testing
   // TODO: Make private
-  isSupported_(): boolean {
+  static isSupported_(): boolean {
     return (
       'serviceWorker' in navigator &&
       'PushManager' in window &&

packages/messaging/test/controller-delete-token.test.ts

@@ -29,21 +29,10 @@ import { makeFakeApp } from './testing-utils/make-fake-app';
 import { makeFakeSubscription } from './testing-utils/make-fake-subscription';
 import { makeFakeSWReg } from './testing-utils/make-fake-sw-reg';
 
-const FAKE_SUBSCRIPTION = makeFakeSubscription();
-const EXAMPLE_TOKEN_SAVE = {
-  swScope: '/example-scope',
-  vapidKey: base64ToArrayBuffer(
-    'BNJxw7sCGkGLOUP2cawBaBXRuWZ3lw_PmQMgreLVVvX_b' +
-      '4emEWVURkCF8fUTHEFe2xrEgTt5ilh5xD94v0pFe_I'
-  ),
-  fcmSenderId: '1234567',
-  fcmToken: 'qwerty',
-  fcmPushSet: '7654321',
-  endpoint: FAKE_SUBSCRIPTION.endpoint,
-  auth: FAKE_SUBSCRIPTION.getKey('auth')!,
-  p256dh: FAKE_SUBSCRIPTION.getKey('p256dh')!,
-  createTime: Date.now()
-};
+import { describe } from './testing-utils/messaging-test-runner';
+
+let FAKE_SUBSCRIPTION: PushSubscription;
+let EXAMPLE_TOKEN_SAVE: any;
 
 describe('Firebase Messaging > *Controller.deleteToken()', () => {
   let sandbox: sinon.SinonSandbox;
@@ -71,6 +60,24 @@ describe('Firebase Messaging > *Controller.deleteToken()', () => {
     return registration;
   }
 
+  before(() => {
+    FAKE_SUBSCRIPTION = makeFakeSubscription();
+    EXAMPLE_TOKEN_SAVE = {
+      swScope: '/example-scope',
+      vapidKey: base64ToArrayBuffer(
+        'BNJxw7sCGkGLOUP2cawBaBXRuWZ3lw_PmQMgreLVVvX_b' +
+          '4emEWVURkCF8fUTHEFe2xrEgTt5ilh5xD94v0pFe_I'
+      ),
+      fcmSenderId: '1234567',
+      fcmToken: 'qwerty',
+      fcmPushSet: '7654321',
+      endpoint: FAKE_SUBSCRIPTION.endpoint,
+      auth: FAKE_SUBSCRIPTION.getKey('auth')!,
+      p256dh: FAKE_SUBSCRIPTION.getKey('p256dh')!,
+      createTime: Date.now()
+    };
+  });
+
   beforeEach(() => {
     sandbox = sinon.sandbox.create();
     app = makeFakeApp({

packages/messaging/test/controller-get-token.test.ts

@@ -132,7 +132,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
 
   it('should throw on unsupported browsers', () => {
     sandbox
-      .stub(WindowController.prototype, 'isSupported_')
+      .stub(WindowController, 'isSupported_')
       .callsFake(() => false);
 
     const messagingService = new WindowController(app);

packages/messaging/test/controller-interface.test.ts

@@ -29,6 +29,8 @@ import { VapidDetailsModel } from '../src/models/vapid-details-model';
 import { makeFakeApp } from './testing-utils/make-fake-app';
 import { makeFakeSWReg } from './testing-utils/make-fake-sw-reg';
 
+import { describe } from './testing-utils/messaging-test-runner';
+
 const controllersToTest = [WindowController, SWController];
 
 /**

packages/messaging/test/get-sw-reg.test.ts

@@ -23,6 +23,8 @@ import { ERROR_CODES } from '../src/models/errors';
 import { makeFakeApp } from './testing-utils/make-fake-app';
 import { makeFakeSWReg } from './testing-utils/make-fake-sw-reg';
 
+import { describe } from './testing-utils/messaging-test-runner';
+
 const EXAMPLE_SENDER_ID = '1234567890';
 
 const app = makeFakeApp({

packages/messaging/test/iid-model.test.ts

@@ -23,10 +23,12 @@ import { IIDModel } from '../src/models/iid-model';
 import { makeFakeSubscription } from './testing-utils/make-fake-subscription';
 import { fetchMock } from './testing-utils/mock-fetch';
 
+import { describe } from './testing-utils/messaging-test-runner';
+
 const fcmSenderId = '1234567';
 const fcmToken = 'qwerty';
 const fcmPushSet = '7654321';
-const subscription = makeFakeSubscription();
+let subscription: PushSubscription;
 // prettier-ignore
 const appPubKey = new Uint8Array([
   255, 237, 107, 177, 171, 78, 84, 131, 221, 231, 87, 188, 22, 232, 71, 15
@@ -35,6 +37,11 @@ const appPubKey = new Uint8Array([
 describe('Firebase Messaging > IIDModel', () => {
   let sandbox: sinon.SinonSandbox;
   let globalIIDModel: IIDModel;
+
+  before(() => {
+    subscription = makeFakeSubscription();
+  });
+
   beforeEach(() => {
     sandbox = sinon.sandbox.create();
     globalIIDModel = new IIDModel();

packages/messaging/test/sw-controller.test.ts

@@ -33,6 +33,8 @@ import { base64ToArrayBuffer } from '../src/helpers/base64-to-array-buffer';
 import { DEFAULT_PUBLIC_VAPID_KEY } from '../src/models/fcm-details';
 import { VapidDetailsModel } from '../src/models/vapid-details-model';
 
+import { describe } from './testing-utils/messaging-test-runner';
+
 const VALID_VAPID_KEY =
   'BJzVfWqLoALJdgV20MYy6lrj0OfhmE16PI1qLIIYx2ZZL3FoQWJJL8L0rf7rS7tqd92j_3xN3fmejKK5Eb7yMYw';
 

packages/messaging/test/testing-utils/make-fake-subscription.ts

@@ -14,14 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * FakeSubscription Constructor.
- */
-const fakeSubscription = ((() => {}) as any) as {
-  new (): PushSubscription;
-};
-fakeSubscription.prototype = PushSubscription.prototype;
-
 function stringToArrayBuffer(str: string): ArrayBuffer {
   // String char codes are 16 bits (See MDN).
   const arrayBuffer = new ArrayBuffer(str.length * 2);
@@ -38,6 +30,11 @@ function stringToArrayBuffer(str: string): ArrayBuffer {
  * @return Returns a fake subscription.
  */
 export function makeFakeSubscription(options: any = {}): PushSubscription {
+  const fakeSubscription = ((() => {}) as any) as {
+    new (): PushSubscription;
+  };
+  fakeSubscription.prototype = PushSubscription.prototype;
+
   const fakeSub = new fakeSubscription();
 
   // Set endpoint

packages/messaging/test/testing-utils/make-fake-sw-reg.ts

@@ -16,15 +16,15 @@
 
 import * as sinon from 'sinon';
 
-const fakeRegistration = ((() => {}) as any) as {
-  new (): ServiceWorkerRegistration;
-};
-fakeRegistration.prototype = ServiceWorkerRegistration.prototype;
-
 export function makeFakeSWReg(
   selectedState?: string,
   desiredValue?: object
 ): ServiceWorkerRegistration {
+  const fakeRegistration = ((() => {}) as any) as {
+    new (): ServiceWorkerRegistration;
+  };
+  fakeRegistration.prototype = ServiceWorkerRegistration.prototype;
+
   const fakeReg: ServiceWorkerRegistration = new fakeRegistration();
   // No need to use a sandbox to stub this object as it should be a used
   // once per test.

packages/messaging/test/testing-utils/messaging-test-runner.ts

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { WindowController } from '../../src/controllers/window-controller';
+
+/** Runner for tests that require service worker functionality. */
+const runner = WindowController.isSupported_() ? describe : describe.skip;
+export { runner as describe };