refactor: Migrate Forwarder Tests to TypeScript (#976)

Author: alexs-mparticle

src/mp-instance.ts

@@ -129,10 +129,10 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
 
     // required for forwarders once they reference the mparticle instance
     this.IdentityType = IdentityType;
-    this.EventType = EventType as unknown as valueof<typeof EventType>;
-    this.CommerceEventType = CommerceEventType as unknown as valueof<typeof CommerceEventType>;
-    this.PromotionType = PromotionActionType as unknown as valueof<typeof PromotionActionType>;
-    this.ProductActionType = ProductActionType as unknown as valueof<typeof ProductActionType>;
+    this.EventType = EventType;
+    this.CommerceEventType = CommerceEventType;
+    this.PromotionType = PromotionActionType;
+    this.ProductActionType = ProductActionType;
 
 
     this._Identity = new Identity(this);

src/mparticle-instance-manager.ts

@@ -1,13 +1,12 @@
 import Polyfill from './polyfill';
-import Types, { CommerceEventType, EventType, ProductActionType, PromotionActionType } from './types';
+import { CommerceEventType, EventType, IdentityType, ProductActionType, PromotionActionType } from './types';
 import Constants from './constants';
 import mParticleInstance, { IMParticleWebSDKInstance } from './mp-instance.js';
 import _BatchValidator from './mockBatchCreator';
 import MPSideloadedKit from './sideloadedKit';
 import { IMParticleInstanceManager } from './sdkRuntimeModels';
 import { IStore } from './store';
 import { Dictionary } from '@mparticle/web-sdk';
-import { valueof } from './utils';
 
 if (!Array.prototype.forEach) {
     Array.prototype.forEach = Polyfill.forEach;
@@ -32,11 +31,11 @@ function mParticleInstanceManager(this: IMParticleInstanceManager) {
     // Only leaving this here in case any clients are trying to access mParticle.Store, to prevent from throwing
     this.Store = {} as IStore;
     this._instances = {} as Dictionary<IMParticleWebSDKInstance>;
-    this.IdentityType = Types.IdentityType;
-    this.EventType = EventType as unknown as valueof<typeof EventType>;
-    this.CommerceEventType = CommerceEventType as unknown as valueof<typeof CommerceEventType>;
-    this.PromotionType = PromotionActionType as unknown as valueof<typeof PromotionActionType>;
-    this.ProductActionType = ProductActionType as unknown as valueof<typeof ProductActionType>;
+    this.IdentityType = IdentityType;
+    this.EventType = EventType;
+    this.CommerceEventType = CommerceEventType;
+    this.PromotionType = PromotionActionType;
+    this.ProductActionType = ProductActionType;
 
     this.MPSideloadedKit = MPSideloadedKit;
 

src/sdkRuntimeModels.ts

@@ -164,10 +164,11 @@ export interface SDKProduct {
 // https://go.mparticle.com/work/SQDSDKS-6949
 export interface MParticleWebSDK {
     addForwarder(mockForwarder: MPForwarder): void;
-    IdentityType: valueof<typeof IdentityType>;
-    CommerceEventType: valueof<typeof CommerceEventType>;
-    EventType: valueof<typeof EventType>;
-    PromotionType: valueof<typeof PromotionActionType>;
+    IdentityType: typeof IdentityType;
+    CommerceEventType: typeof CommerceEventType;
+    EventType: typeof EventType;
+    PromotionType: typeof PromotionActionType;
+    ProductActionType: typeof ProductActionType;
     Identity: SDKIdentityApi;
     Logger: SDKLoggerApi;
     Consent: SDKConsentApi;
@@ -205,13 +206,15 @@ export interface MParticleWebSDK {
     logError(error: IErrorLogMessage, attrs?: SDKEventAttrs): void;
     logLink(selector: string, eventName: string, eventType: valueof<typeof EventType>, eventInfo: SDKEventAttrs): void;
     logForm(selector: string, eventName: string, eventType: valueof<typeof EventType>, eventInfo: SDKEventAttrs): void;
-    logPageView(eventName: string, attrs?: SDKEventAttrs, customFlags?: SDKEventCustomFlags, eventOptions?: SDKEventOptions): void;
+    logPageView(eventName?: string, attrs?: SDKEventAttrs, customFlags?: SDKEventCustomFlags, eventOptions?: SDKEventOptions): void;
     setOptOut(isOptingOut: boolean): void;
     eCommerce: SDKECommerceAPI;
     isInitialized(): boolean;
-    ProductActionType: valueof<typeof ProductActionType>;
     ready(f: Function): void;
-    reset(instance: IMParticleWebSDKInstance): void;
+
+    // https://go.mparticle.com/work/SQDSDKS-7072
+    reset(instance?: IMParticleWebSDKInstance): void;
+
     setAppName(name: string): void;
     setAppVersion(version: string): void;
     setOptOut(isOptingOut: boolean): void;

test/src/tests-batchUploader_3.ts

@@ -147,27 +147,27 @@ describe('batch uploader', () => {
             });
         });
 
-        it('should return pending uploads if a 500 is returned', function(done) {
+        it('should return pending uploads if a 500 is returned', async function() {
             window.mParticle._resetForTests(MPConfig);
 
             fetchMock.post(urls.events, 500);
 
             window.mParticle.init(apiKey, window.mParticle.config);
-            waitForCondition(hasIdentifyReturned)
-            .then(() => {
+            await waitForCondition(hasIdentifyReturned);
+
             window.mParticle.logEvent('Test Event');
 
             let pendingEvents = window.mParticle.getInstance()._APIClient.uploader.eventsQueuedForProcessing;
 
-            pendingEvents.length.should.equal(3)
+            pendingEvents.length.should.equal(3);
             pendingEvents[0].EventName.should.equal(1);
             pendingEvents[1].EventName.should.equal(10);
             pendingEvents[2].EventName.should.equal('Test Event');
 
             fetchMock.post(urls.events, 200);
 
             // First fetch call is an identify call
-            (fetchMock.lastCall()[0].endsWith('identify')).should.equal(true)
+            (fetchMock.lastCall()[0].endsWith('identify')).should.equal(true);
             window.mParticle.upload();
 
             let nowPendingEvents = window.mParticle.getInstance()._APIClient.uploader.eventsQueuedForProcessing;
@@ -178,9 +178,6 @@ describe('batch uploader', () => {
             batch.events[1].event_type.should.equal('application_state_transition');
             batch.events[2].event_type.should.equal('custom_event');
             batch.events[2].data.event_name.should.equal('Test Event');
-
-            done();
-            })
         });
 
         it('should send source_message_id with events to v3 endpoint', function(done) {