add tests for getPushSubscriptionModel

Author: jkasten2

__test__/support/helpers/core.ts

@@ -5,7 +5,8 @@ import { CoreDelta } from "../../../src/core/models/CoreDeltas";
 import { SupportedSubscription, SubscriptionType } from "../../../src/core/models/SubscriptionModels";
 import { ModelName } from "../../../src/core/models/SupportedModels";
 import { DUMMY_MODEL_ID, DUMMY_PUSH_TOKEN, DUMMY_SUBSCRIPTION_ID } from "../constants";
-
+import CoreModule from "../../../src/core/CoreModule";
+import { CoreModuleDirector } from "../../../src/core/CoreModuleDirector";
 
 export function generateNewSubscription(modelId = '0000000000') {
   return new OSModel<SupportedSubscription>(
@@ -40,6 +41,13 @@ export function getDummyPushSubscriptionOSModel(): OSModel<SupportedSubscription
   }, DUMMY_MODEL_ID);
 }
 
+// Requirement: Test must also call TestEnvironment.initialize();
+export async function getCoreModuleDirector(): Promise<CoreModuleDirector> {
+  const coreModule = new CoreModule();
+  await coreModule.init();
+  return new CoreModuleDirector(coreModule);
+}
+
 export const passIfBroadcastNTimes = (target: number, broadcastCount: number, pass: () => void) => {
   if (broadcastCount === target) {
     pass();

__test__/unit/core/coreModuleDirector.test.ts

@@ -0,0 +1,46 @@
+import { CoreModuleDirector } from "../../../src/core/CoreModuleDirector";
+import { OSModel } from "../../../src/core/modelRepo/OSModel";
+import { SupportedSubscription } from "../../../src/core/models/SubscriptionModels";
+import { TestEnvironment } from "../../support/environment/TestEnvironment";
+import { getCoreModuleDirector, getDummyPushSubscriptionOSModel } from "../../support/helpers/core";
+
+describe('CoreModuleDirector tests', () => {
+  beforeEach(() => {
+    TestEnvironment.initialize();
+  });
+  describe('getPushSubscriptionModel', () => {
+    beforeEach(() => {
+      jest.resetAllMocks();
+    });
+
+    async function getPushSubscriptionModel(): Promise<OSModel<SupportedSubscription> | undefined> {
+      return (await getCoreModuleDirector()).getPushSubscriptionModel();
+    }
+
+    test('returns undefined when it find no push records', async () => {
+      expect(await getPushSubscriptionModel()).toBe(undefined);
+    });
+
+    test('returns current subscription when available', async () => {
+      const pushModelCurrent = getDummyPushSubscriptionOSModel();
+      test.stub(CoreModuleDirector.prototype, "getPushSubscriptionModelByCurrentToken", Promise.resolve(pushModelCurrent));
+      expect(await getPushSubscriptionModel()).toBe(pushModelCurrent);
+    });
+
+    test('returns last known subscription when current is unavailable', async () => {
+      const pushModelLastKnown = getDummyPushSubscriptionOSModel();
+      test.stub(CoreModuleDirector.prototype, "getPushSubscriptionModelByLastKnownToken", Promise.resolve(pushModelLastKnown));
+      expect(await getPushSubscriptionModel()).toBe(pushModelLastKnown);
+    });
+
+    test('returns current subscription over last known', async () => {
+      const pushModelCurrent = getDummyPushSubscriptionOSModel();
+      test.stub(CoreModuleDirector.prototype, "getPushSubscriptionModelByCurrentToken", Promise.resolve(pushModelCurrent));
+
+      const pushModelLastKnown = getDummyPushSubscriptionOSModel();
+      test.stub(CoreModuleDirector.prototype, "getPushSubscriptionModelByLastKnownToken", Promise.resolve(pushModelLastKnown));
+
+      expect(await getPushSubscriptionModel()).toBe(pushModelCurrent);
+    });
+  });
+});

src/shared/managers/SubscriptionManager.ts

@@ -163,7 +163,6 @@ export class SubscriptionManager {
   }
 
   private async _updatePushSubscriptionModelWithRawSubscription(rawPushSubscription: RawPushSubscription) {
-    // This undefined when it shouldn't be
     const pushModel = await OneSignal.coreDirector.getPushSubscriptionModel();
 
     if (!pushModel) {