add more test

Author: fadi-george

__test__/support/helpers/database.ts

@@ -0,0 +1,5 @@
+import { db } from 'src/shared/database/client';
+
+export const setIsPushEnabled = async (isPushEnabled: boolean) => {
+  await db.put('Options', { key: 'isPushEnabled', value: isPushEnabled });
+};

src/core/executors/LoginUserOperationExecutor.test.ts

@@ -164,8 +164,13 @@ describe('LoginUserOperationExecutor', () => {
       identityModelStore.model.setProperty(
         IdentityConstants.ONESIGNAL_ID,
         DUMMY_ONESIGNAL_ID,
+        ModelChangeTags.HYDRATE,
+      );
+      propertiesModelStore.model.setProperty(
+        'onesignalId',
+        DUMMY_ONESIGNAL_ID,
+        ModelChangeTags.HYDRATE,
       );
-      propertiesModelStore.model.setProperty('onesignalId', DUMMY_ONESIGNAL_ID);
       await setPushToken(DUMMY_PUSH_TOKEN);
 
       const subscriptionModel = new SubscriptionModel();
@@ -252,8 +257,13 @@ describe('LoginUserOperationExecutor', () => {
       identityModelStore.model.setProperty(
         IdentityConstants.ONESIGNAL_ID,
         DUMMY_ONESIGNAL_ID,
+        ModelChangeTags.HYDRATE,
+      );
+      propertiesModelStore.model.setProperty(
+        'onesignalId',
+        DUMMY_ONESIGNAL_ID,
+        ModelChangeTags.HYDRATE,
       );
-      propertiesModelStore.model.setProperty('onesignalId', DUMMY_ONESIGNAL_ID);
 
       const executor = getExecutor();
 

src/core/executors/RefreshUserOperationExecutor.test.ts

@@ -12,6 +12,7 @@ import { SomeOperation } from '__test__/support/helpers/executors';
 import {
   setGetUserError,
   setGetUserResponse,
+  setUpdateSubscriptionResponse,
 } from '__test__/support/helpers/requests';
 import { clearAll } from 'src/shared/database/client';
 import { setPushToken } from 'src/shared/database/subscription';
@@ -28,6 +29,7 @@ import { PropertiesModelStore } from '../modelStores/PropertiesModelStore';
 import type { SubscriptionModelStore } from '../modelStores/SubscriptionModelStore';
 import { NewRecordsState } from '../operationRepo/NewRecordsState';
 import { RefreshUserOperation } from '../operations/RefreshUserOperation';
+import { ModelChangeTags } from '../types/models';
 import { ExecutionResult } from '../types/operation';
 import { RefreshUserOperationExecutor } from './RefreshUserOperationExecutor';
 
@@ -60,6 +62,11 @@ describe('RefreshUserOperationExecutor', () => {
       buildUserService,
       'getRebuildOperationsIfCurrentUser',
     );
+
+    setUpdateSubscriptionResponse({
+      subscriptionId: '*',
+      response: {},
+    });
   });
 
   const getExecutor = () => {
@@ -96,6 +103,7 @@ describe('RefreshUserOperationExecutor', () => {
       identityModelStore.model.setProperty(
         IdentityConstants.ONESIGNAL_ID,
         DUMMY_ONESIGNAL_ID,
+        ModelChangeTags.HYDRATE,
       );
     });
 
@@ -186,7 +194,7 @@ describe('RefreshUserOperationExecutor', () => {
       pushSubModel.token = DUMMY_PUSH_TOKEN;
       pushSubModel.notification_types = NotificationType.Subscribed;
 
-      subscriptionModelStore.add(pushSubModel);
+      subscriptionModelStore.add(pushSubModel, ModelChangeTags.HYDRATE);
       await setPushToken(DUMMY_PUSH_TOKEN);
 
       const executor = getExecutor();

src/shared/helpers/init.test.ts

@@ -2,11 +2,11 @@ import TestContext from '__test__/support/environment/TestContext';
 import { TestEnvironment } from '__test__/support/environment/TestEnvironment';
 import Context from 'src/page/models/Context';
 import { type AppConfig } from 'src/shared/config/types';
-import type { Mock } from 'vitest';
+import type { MockInstance } from 'vitest';
 import { db } from '../database/client';
 import * as InitHelper from './init';
 
-let isSubscriptionExpiringSpy: Mock;
+let isSubscriptionExpiringSpy: MockInstance;
 
 beforeEach(async () => {
   await TestEnvironment.initialize();

src/shared/listeners.test.ts

@@ -1,16 +1,127 @@
+import { DUMMY_PUSH_TOKEN } from '__test__/constants';
 import { TestEnvironment } from '__test__/support/environment/TestEnvironment';
-import OneSignal from 'src/onesignal/OneSignal';
-import type { Mock } from 'vitest';
+import { createPushSub } from '__test__/support/environment/TestEnvironmentHelpers';
+import { setIsPushEnabled } from '__test__/support/helpers/database';
+import {
+  getSubscriptionFn,
+  MockServiceWorker,
+} from '__test__/support/mocks/MockServiceWorker';
+import * as eventListeners from 'src/shared/listeners';
+import type { MockInstance } from 'vitest';
+import { getAppState } from './database/config';
+import { setPushToken } from './database/subscription';
 
-let emitterSpy: Mock;
+Object.defineProperty(global.navigator, 'serviceWorker', {
+  value: new MockServiceWorker(),
+  writable: true,
+});
+
+let emitterSpy: MockInstance;
 
 beforeEach(async () => {
   await TestEnvironment.initialize();
   emitterSpy = vi.spyOn(OneSignal.emitter, 'on');
 });
 
-afterEach(() => {
-  vi.resetAllMocks();
+describe('checkAndTriggerSubscriptionChanged', () => {
+  test('should trigger subscription changed', async () => {
+    const changeListener = vi.fn();
+    OneSignal.User.PushSubscription.addEventListener('change', changeListener);
+
+    // no change
+    getSubscriptionFn.mockResolvedValue({
+      endpoint: undefined,
+    });
+    await setIsPushEnabled(false);
+    await eventListeners.checkAndTriggerSubscriptionChanged();
+
+    expect(changeListener).not.toHaveBeenCalled();
+
+    // push enabled change
+    await setIsPushEnabled(true); // mimic old opt in
+    changeListener.mockClear();
+    await eventListeners.checkAndTriggerSubscriptionChanged();
+
+    expect(changeListener).toHaveBeenCalledWith({
+      current: {
+        id: undefined,
+        optedIn: false,
+        token: undefined,
+      },
+      previous: {
+        id: undefined,
+        optedIn: true,
+        token: undefined,
+      },
+    });
+    expect(await getAppState()).toMatchObject({
+      lastKnownOptedIn: false,
+      lastKnownPushEnabled: false,
+      lastKnownPushToken: undefined,
+      lastKnownPushId: undefined,
+    });
+
+    // token change
+    getSubscriptionFn.mockResolvedValue({
+      endpoint: DUMMY_PUSH_TOKEN,
+    });
+    await setIsPushEnabled(false);
+
+    changeListener.mockClear();
+    await eventListeners.checkAndTriggerSubscriptionChanged();
+
+    expect(changeListener).toHaveBeenCalledWith({
+      current: {
+        id: undefined,
+        optedIn: false,
+        token: DUMMY_PUSH_TOKEN,
+      },
+      previous: {
+        id: undefined,
+        optedIn: false,
+        token: undefined,
+      },
+    });
+    expect(await getAppState()).toMatchObject({
+      lastKnownOptedIn: false,
+      lastKnownPushEnabled: false,
+      lastKnownPushToken: DUMMY_PUSH_TOKEN,
+      lastKnownPushId: undefined,
+    });
+
+    // id change
+    const token = 'some-token';
+    const newID = 'some-id';
+    const pushModel = createPushSub({
+      id: newID,
+      token,
+    });
+    await setPushToken(token);
+    OneSignal.coreDirector.subscriptionModelStore.add(pushModel);
+    getSubscriptionFn.mockResolvedValue({
+      endpoint: token,
+    });
+
+    await eventListeners.checkAndTriggerSubscriptionChanged();
+    expect(changeListener).toHaveBeenCalledWith({
+      current: {
+        id: newID,
+        optedIn: false,
+        token,
+      },
+      previous: {
+        id: undefined,
+        optedIn: false,
+        token,
+      },
+    });
+    expect(await getAppState()).toMatchObject({
+      lastKnownOptedIn: false,
+      lastKnownPushEnabled: false,
+      lastKnownPushToken: token,
+      lastKnownPushId: newID,
+    });
+  });
 });
 
 test('Adding click listener fires internal EventHelper', async () => {

src/shared/listeners.ts

@@ -38,6 +38,7 @@ export async function checkAndTriggerSubscriptionChanged() {
 
   const pushModel = await OneSignal.coreDirector.getPushSubscriptionModel();
   const pushSubscriptionId = pushModel?.id;
+
   const didStateChange =
     isPushEnabled !== lastKnownPushEnabled ||
     currentPushToken !== lastKnownPushToken ||