test: converted .then to async/await for batchUploader_3 test

Author: jaissica12

test/src/tests-batchUploader_3.ts

@@ -49,12 +49,12 @@ describe('batch uploader', () => {
             window.mParticle.config.flags.eventBatchingIntervalMillis = 0;
         });
 
-        it('should use custom v3 endpoint', function(done) {
+        it('should use custom v3 endpoint', async () => {
             window.mParticle._resetForTests(MPConfig);
             fetchMock.resetHistory();
             window.mParticle.init(apiKey, window.mParticle.config);
-            waitForCondition(hasIdentifyReturned)
-            .then(() => {
+            await waitForCondition(hasIdentifyReturned);
+            
             window.mParticle.logEvent('Test Event');
 
             window.mParticle.upload();
@@ -68,16 +68,13 @@ 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 have latitude/longitude for location when batching', function(done) {
+        it('should have latitude/longitude for location when batching', async () => {
             window.mParticle._resetForTests(MPConfig);
             window.mParticle.init(apiKey, window.mParticle.config);
-            waitForCondition(hasIdentifyReturned)
-            .then(() => {
+            await waitForCondition(hasIdentifyReturned);
+            
             window.mParticle.setPosition(100, 100);
             window.mParticle.logEvent('Test Event');
             window.mParticle.upload();
@@ -87,16 +84,13 @@ describe('batch uploader', () => {
             endpoint.should.equal(urls.events);
             batch.events[2].data.location.should.have.property('latitude', 100)
             batch.events[2].data.location.should.have.property('longitude', 100)
-    
-            done();
-            })
         });
 
-        it('should force uploads when using public `upload`', function(done) {
+        it('should force uploads when using public `upload`', async () => {
             window.mParticle._resetForTests(MPConfig);
             window.mParticle.init(apiKey, window.mParticle.config);
-            waitForCondition(hasIdentifyReturned)
-            .then(() => {
+            await waitForCondition(hasIdentifyReturned);
+            
             window.mParticle.logEvent('Test Event');
             // Identity call
             // Session start, AST, and `Test Event` are queued.
@@ -115,17 +109,14 @@ 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 force uploads when a commerce event is called', function(done) {
+        it('should force uploads when a commerce event is called', async () => {
             window.mParticle._resetForTests(MPConfig);
             window.mParticle.init(apiKey, window.mParticle.config);
 
-            waitForCondition(hasIdentifyReturned)
-            .then(() => {
+            await waitForCondition(hasIdentifyReturned);
+            
             window.mParticle.logEvent('Test Event');
 
             var product1 = window.mParticle.eCommerce.createProduct('iphone', 'iphoneSKU', 999);
@@ -142,9 +133,6 @@ describe('batch uploader', () => {
             batch.events[2].data.event_name.should.equal('Test Event');
             batch.events[3].event_type.should.equal('commerce_event');
             batch.events[3].data.product_action.action.should.equal('add_to_cart');
-
-            done();
-            });
         });
 
         it('should return pending uploads if a 500 is returned', async function() {
@@ -180,12 +168,12 @@ describe('batch uploader', () => {
             batch.events[2].data.event_name.should.equal('Test Event');
         });
 
-        it('should send source_message_id with events to v3 endpoint', function(done) {
+        it('should send source_message_id with events to v3 endpoint', async () => {
             window.mParticle._resetForTests(MPConfig);
             window.mParticle.init(apiKey, window.mParticle.config);
 
-            waitForCondition(hasIdentifyReturned)
-            .then(() => {
+            await waitForCondition(hasIdentifyReturned);
+            
             window.mParticle.logEvent('Test Event');
 
             window.mParticle.upload();
@@ -196,16 +184,13 @@ describe('batch uploader', () => {
 
             endpoint.should.equal(urls.events);
             batch.events[0].data.should.have.property('source_message_id')
-
-            done();
-            })
         });
 
-        it('should send user-defined SourceMessageId events to v3 endpoint', function(done) {
+        it('should send user-defined SourceMessageId events to v3 endpoint', async () => {
             window.mParticle._resetForTests(MPConfig);
             window.mParticle.init(apiKey, window.mParticle.config);
-            waitForCondition(hasIdentifyReturned)
-            .then(() => {
+            await waitForCondition(hasIdentifyReturned);
+            
             window.mParticle.logBaseEvent({
                 messageType: 4,
                 name: 'Test Event',
@@ -224,11 +209,9 @@ describe('batch uploader', () => {
             endpoint.should.equal(urls.events);
             // event batch includes session start, ast, then last event is Test Event
             batch.events[batch.events.length-1].data.should.have.property('source_message_id', 'abcdefg')
-
-            done();
-            })
         });
-
+        
+        // http://go/j-SDKE-301
         it('should call the identity callback after a session ends if user is returning to the page after a long period of time', async () => {
             // Background of bug that this test fixes:
             // User navigates away from page and returns after some time
@@ -253,12 +236,12 @@ describe('batch uploader', () => {
             var endSessionFunction = window.mParticle.getInstance()._SessionManager.endSession;
 
             window.mParticle.init(apiKey, window.mParticle.config);
-            waitForCondition(() => {
-            return (
-                window.mParticle.getInstance()._Store?.identityCallInFlight === false
-            );
-            })
-            .then(() => {
+            await waitForCondition(() => {
+                return (
+                    window.mParticle.getInstance()._Store?.identityCallInFlight === false
+                );
+            });
+            
             // Mock end session so that the SDK doesn't actually send it. We do this
             // to mimic a return to page behavior, below:
             window.mParticle.getInstance()._SessionManager.endSession = function() {}
@@ -275,12 +258,12 @@ describe('batch uploader', () => {
 
             // Initialize imitates returning to the page
             window.mParticle.init(apiKey, window.mParticle.config);
-            waitForCondition(() => {
-            return (
-                window.mParticle.getInstance()?._Store?.identityCallInFlight === false
-            );
-            })
-            .then(async () => {
+            await waitForCondition(() => {
+                return (
+                    window.mParticle.getInstance()?._Store?.identityCallInFlight === false
+                );
+            });
+            
             // Manually initiate the upload process - turn event into batches and upload the batch 
             await window.mParticle.getInstance()._APIClient.uploader.prepareAndUpload();
 
@@ -431,9 +414,6 @@ describe('batch uploader', () => {
             batch3SessionStart.data.session_start_unixtime_ms.should.equal(
                 batch3AST.data.session_start_unixtime_ms
             );
-
-            })
-            })
         });
     });
 });