A few more tests

Author: mmermerkaya

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

@@ -178,12 +178,20 @@ describe('SwController', () => {
   });
 
   describe('onPush', () => {
-    it('does not throw if push is not from FCM', async () => {
+    it('does nothing if push is not from FCM', async () => {
+      const showNotificationSpy = spy(self.registration, 'showNotification');
+      const matchAllSpy = spy(self.clients, 'matchAll');
+
+      await callEventListener(makeEvent('push', {}));
+
       await callEventListener(
         makeEvent('push', {
           data: {}
         })
       );
+
+      expect(showNotificationSpy).not.to.have.been.called;
+      expect(matchAllSpy).not.to.have.been.called;
     });
 
     it('sends a message to window clients if a window client is visible', async () => {
@@ -267,6 +275,32 @@ describe('SwController', () => {
 
       expect(bgMessageHandlerSpy).to.have.been.calledWith();
     });
+
+    it('warns if there are more action buttons than the browser limit', async () => {
+      stub(Notification, 'maxActions').value(1);
+
+      const warnStub = stub(console, 'warn');
+
+      await callEventListener(
+        makeEvent('push', {
+          data: {
+            json: () => ({
+              notification: {
+                ...NOTIFICATION_MESSAGE_PAYLOAD,
+                actions: [
+                  { action: 'like', title: 'Like' },
+                  { action: 'favorite', title: 'Favorite' }
+                ]
+              }
+            })
+          }
+        })
+      );
+
+      expect(warnStub).to.have.been.calledOnceWith(
+        'This browser only supports 1 actions. The remaining actions will not be displayed.'
+      );
+    });
   });
 
   describe('setBackgrounMessageHandler', () => {

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

@@ -342,8 +342,7 @@ function showNotification(details: NotificationDetails): Promise<void> {
   const { maxActions } = Notification;
   if (actions && maxActions && actions.length > maxActions) {
     console.warn(
-      `This browser only supports ${maxActions} actions.` +
-        `The remaining actions will not be displayed.`
+      `This browser only supports ${maxActions} actions. The remaining actions will not be displayed.`
     );
   }
 

packages/messaging/src/core/token-management.test.ts

@@ -204,6 +204,43 @@ describe('Token Management', () => {
       expect(tokenFromDb).to.deep.equal(expectedTokenDetails);
     });
 
+    it('deletes the token if the update fails', async () => {
+      stub(Notification, 'permission').value('granted');
+
+      // Change create time to be older than a week.
+      tokenDetails.createTime = Date.now() - 8 * 24 * 60 * 60 * 1000; // 8 days
+
+      await dbSet(firebaseDependencies, tokenDetails);
+
+      requestUpdateTokenStub.rejects(new Error('Update failed.'));
+
+      await expect(
+        getToken(
+          firebaseDependencies,
+          swRegistration,
+          tokenDetails.subscriptionOptions!.vapidKey
+        )
+      ).to.be.rejectedWith('Update failed.');
+
+      const expectedTokenDetails: TokenDetails = {
+        ...tokenDetails,
+        createTime: Date.now()
+      };
+
+      expect(requestGetTokenStub).not.to.have.been.called;
+      expect(requestUpdateTokenStub).to.have.been.calledOnceWith(
+        firebaseDependencies,
+        expectedTokenDetails
+      );
+      expect(requestDeleteTokenStub).to.have.been.calledOnceWith(
+        firebaseDependencies,
+        tokenDetails.token
+      );
+
+      const tokenFromDb = await dbGet(firebaseDependencies);
+      expect(tokenFromDb).to.be.undefined;
+    });
+
     it('returns the token if it is valid', async () => {
       stub(Notification, 'permission').value('granted');
 

packages/messaging/src/helpers/migrate-old-database.test.ts

@@ -82,6 +82,21 @@ describe('migrateOldDb', () => {
       const tokenDetails = await migrateOldDatabase('321321321');
       expect(tokenDetails).to.be.null;
     });
+
+    it('does not migrate an entry with missing optional values', async () => {
+      const v2TokenDetails: V2TokenDetails = {
+        fcmToken: 'token-value',
+        swScope: '/scope-value',
+        vapidKey: base64ToArrayBuffer('dmFwaWQta2V5LXZhbHVl'),
+        fcmSenderId: '1234567890',
+        fcmPushSet: '7654321',
+        subscription: new FakePushSubscription()
+      };
+      await put(2, v2TokenDetails);
+
+      const tokenDetails = await migrateOldDatabase('1234567890');
+      expect(tokenDetails).to.be.null;
+    });
   });
 
   describe('version 3', () => {

packages/messaging/src/testing/fakes/service-worker.ts

@@ -108,16 +108,11 @@ export class FakeServiceWorkerRegistration
   sync = (null as unknown) as SyncManager;
   updateViaCache = (null as unknown) as ServiceWorkerUpdateViaCache;
 
-  private readonly notifications: Notification[] = [];
-
   async getNotifications() {
-    return this.notifications;
+    return [];
   }
 
-  async showNotification(title: string, options: NotificationOptions) {
-    const notification = new Notification(title, options);
-    this.notifications.push(notification);
-  }
+  async showNotification() {}
 
   async update() {}