Merge pull request #1004 from ParsePlatform/flovilmart.PushStatus

Push Status API
parse-community · Mar 17, 2016 · 9624970 · 9624970
2 parents 3837d33 + 18781f1
commit 9624970
Show file tree

Hide file tree

Showing 16 changed files with 470 additions and 152 deletions.
diff --git a/spec/GCM.spec.js b/spec/GCM.spec.js
@@ -23,17 +23,15 @@ describe('GCM', () => {
     var data = {
       'alert': 'alert'
     };
-    var pushId = 1;
     var timeStamp = 1454538822113;
     var timeStampISOStr = new Date(timeStamp).toISOString();
 
-    var payload = GCM.generateGCMPayload(data, pushId, timeStamp);
+    var payload = GCM.generateGCMPayload(data, timeStamp);
 
     expect(payload.priority).toEqual('normal');
     expect(payload.timeToLive).toEqual(undefined);
     var dataFromPayload = payload.data;
     expect(dataFromPayload.time).toEqual(timeStampISOStr);
-    expect(dataFromPayload['push_id']).toEqual(pushId);
     var dataFromUser = JSON.parse(dataFromPayload.data);
     expect(dataFromUser).toEqual(data);
     done();
@@ -44,18 +42,16 @@ describe('GCM', () => {
     var data = {
       'alert': 'alert'
     };
-    var pushId = 1;
     var timeStamp = 1454538822113;
     var timeStampISOStr = new Date(timeStamp).toISOString();
     var expirationTime = 1454538922113
 
-    var payload = GCM.generateGCMPayload(data, pushId, timeStamp, expirationTime);
+    var payload = GCM.generateGCMPayload(data, timeStamp, expirationTime);
 
     expect(payload.priority).toEqual('normal');
     expect(payload.timeToLive).toEqual(Math.floor((expirationTime - timeStamp) / 1000));
     var dataFromPayload = payload.data;
     expect(dataFromPayload.time).toEqual(timeStampISOStr);
-    expect(dataFromPayload['push_id']).toEqual(pushId);
     var dataFromUser = JSON.parse(dataFromPayload.data);
     expect(dataFromUser).toEqual(data);
     done();
@@ -66,18 +62,16 @@ describe('GCM', () => {
     var data = {
       'alert': 'alert'
     };
-    var pushId = 1;
     var timeStamp = 1454538822113;
     var timeStampISOStr = new Date(timeStamp).toISOString();
     var expirationTime = 1454538822112;
 
-    var payload = GCM.generateGCMPayload(data, pushId, timeStamp, expirationTime);
+    var payload = GCM.generateGCMPayload(data, timeStamp, expirationTime);
 
     expect(payload.priority).toEqual('normal');
     expect(payload.timeToLive).toEqual(0);
     var dataFromPayload = payload.data;
     expect(dataFromPayload.time).toEqual(timeStampISOStr);
-    expect(dataFromPayload['push_id']).toEqual(pushId);
     var dataFromUser = JSON.parse(dataFromPayload.data);
     expect(dataFromUser).toEqual(data);
     done();
@@ -88,19 +82,17 @@ describe('GCM', () => {
     var data = {
       'alert': 'alert'
     };
-    var pushId = 1;
     var timeStamp = 1454538822113;
     var timeStampISOStr = new Date(timeStamp).toISOString();
     var expirationTime = 2454538822113;
 
-    var payload = GCM.generateGCMPayload(data, pushId, timeStamp, expirationTime);
+    var payload = GCM.generateGCMPayload(data, timeStamp, expirationTime);
 
     expect(payload.priority).toEqual('normal');
     // Four week in second
     expect(payload.timeToLive).toEqual(4 * 7 * 24 * 60 * 60);
     var dataFromPayload = payload.data;
     expect(dataFromPayload.time).toEqual(timeStampISOStr);
-    expect(dataFromPayload['push_id']).toEqual(pushId);
     var dataFromUser = JSON.parse(dataFromPayload.data);
     expect(dataFromUser).toEqual(data);
     done();
@@ -139,6 +131,46 @@ describe('GCM', () => {
     done();
   });
 
+  it('can send GCM request', (done) => {
+    var gcm = new GCM({
+      apiKey: 'apiKey'
+    });
+    // Mock data
+    var expirationTime = 2454538822113;
+    var data = {
+      'expiration_time': expirationTime,
+      'data': {
+        'alert': 'alert'
+      }
+    }
+    // Mock devices
+    var devices = [
+      {
+        deviceToken: 'token'
+      },
+      {
+        deviceToken: 'token2'
+      },
+      {
+        deviceToken: 'token3'
+      },
+      {
+        deviceToken: 'token4'
+      }
+    ];
+
+    gcm.send(data, devices).then((response) => {
+      expect(Array.isArray(response)).toBe(true);
+      expect(response.length).toEqual(devices.length);
+      expect(response.length).toEqual(4);
+      response.forEach((res, index) => {
+        expect(res.transmitted).toEqual(false);
+        expect(res.device).toEqual(devices[index]);
+      })
+      done();
+    })
+  });
+
   it('can slice devices', (done) => {
     // Mock devices
     var devices = [makeDevice(1), makeDevice(2), makeDevice(3), makeDevice(4)];

diff --git a/spec/Parse.Push.spec.js b/spec/Parse.Push.spec.js
@@ -1,20 +1,23 @@
+'use strict';
 describe('Parse.Push', () => {
   it('should properly send push', (done) => {
       var pushAdapter = {
         send: function(body, installations) {
           var badge = body.data.badge;
-          installations.forEach((installation) => {
+          let promises = installations.map((installation) => {
             if (installation.deviceType == "ios") {
               expect(installation.badge).toEqual(badge);
               expect(installation.originalBadge+1).toEqual(installation.badge);
             } else {
               expect(installation.badge).toBeUndefined();
             }
+            return Promise.resolve({
+              err: null,
+              deviceType: installation.deviceType,
+              result: true
+            })
           });
-          return Promise.resolve({
-            body: body,
-            installations: installations
-          });
+          return Promise.all(promises)
         },
         getValidPushTypes: function() {
           return ["ios", "android"];
@@ -56,4 +59,4 @@ describe('Parse.Push', () => {
       done();
     });
   });
-});
+});
diff --git a/spec/ParseACL.spec.js b/spec/ParseACL.spec.js
@@ -1153,7 +1153,6 @@ describe('Parse.ACL', () => {
       var query = new Parse.Query("TestClassMasterACL");
       return query.find();
     }).then((results) => {
-      console.log(JSON.stringify(results[0]));
       ok(!results.length, 'Should not have returned object with secure ACL.');
       done();
     });