Skip to content

Commit 33890bb

Browse files
authored
Do not mark the empty pushs as failed (#4497)
1 parent 75fa16a commit 33890bb

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

spec/PushController.spec.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ describe('PushController', () => {
951951
});
952952
});
953953

954-
it('should mark the _PushStatus as failed when audience has no deviceToken', (done) => {
954+
it('should not mark the _PushStatus as failed when audience has no deviceToken', (done) => {
955955
var auth = {
956956
isMaster: true
957957
}
@@ -999,16 +999,14 @@ describe('PushController', () => {
999999
var config = Config.get(Parse.applicationId);
10001000
return Parse.Object.saveAll(installations).then(() => {
10011001
return pushController.sendPush(payload, {}, config, auth)
1002-
.then(() => { done.fail('should not success') })
1003-
.catch(() => {})
10041002
}).then(() => new Promise(resolve => setTimeout(resolve, 100)));
10051003
}).then(() => {
10061004
const query = new Parse.Query('_PushStatus');
10071005
return query.find({useMasterKey: true}).then((results) => {
10081006
expect(results.length).toBe(1);
10091007
const pushStatus = results[0];
10101008
expect(pushStatus.get('numSent')).toBe(0);
1011-
expect(pushStatus.get('status')).toBe('failed');
1009+
expect(pushStatus.get('status')).toBe('succeeded');
10121010
done();
10131011
});
10141012
}).catch((err) => {

src/Push/PushQueue.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export class PushQueue {
3838
{limit: 0, count: true});
3939
}).then(({results, count}) => {
4040
if (!results || count == 0) {
41-
return Promise.reject({error: 'PushController: no results in query'})
41+
return pushStatus.complete();
4242
}
4343
pushStatus.setRunning(Math.ceil(count / limit));
4444
let skip = 0;

0 commit comments

Comments
 (0)