Skip to content

Commit ef59a8c

Browse files
jeffjenflovilmart
authored andcommitted
Send deviceType key to push handler (#39)
1 parent bdc2a82 commit ef59a8c

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

spec/ParsePushAdapter.spec.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ describe('ParsePushAdapter', () => {
8181
];
8282

8383
var deviceMap = ParsePushAdapter.classifyInstallations(installations, validPushTypes);
84-
expect(deviceMap['android']).toEqual([makeDevice('androidToken')]);
85-
expect(deviceMap['ios']).toEqual([makeDevice('iosToken')]);
84+
expect(deviceMap['android']).toEqual([makeDevice('androidToken', 'android')]);
85+
expect(deviceMap['ios']).toEqual([makeDevice('iosToken', 'ios')]);
8686
expect(deviceMap['win']).toBe(undefined);
8787
done();
8888
});
@@ -129,14 +129,14 @@ describe('ParsePushAdapter', () => {
129129
var args = androidSender.send.calls.first().args;
130130
expect(args[0]).toEqual(data);
131131
expect(args[1]).toEqual([
132-
makeDevice('androidToken')
132+
makeDevice('androidToken', 'android')
133133
]);
134134
// Check ios sender
135135
expect(iosSender.send).toHaveBeenCalled();
136136
args = iosSender.send.calls.first().args;
137137
expect(args[0]).toEqual(data);
138138
expect(args[1]).toEqual([
139-
makeDevice('iosToken')
139+
makeDevice('iosToken', 'ios')
140140
]);
141141
done();
142142
});
@@ -206,18 +206,18 @@ describe('ParsePushAdapter', () => {
206206
var args = androidSender.send.calls.first().args;
207207
expect(args[0]).toEqual(data);
208208
expect(args[1]).toEqual([
209-
makeDevice('androidToken'),
210-
makeDevice('androidToken'),
211-
makeDevice('androidToken'),
212-
makeDevice('androidToken')
209+
makeDevice('androidToken', 'android'),
210+
makeDevice('androidToken', 'android'),
211+
makeDevice('androidToken', 'android'),
212+
makeDevice('androidToken', 'android')
213213
]);
214214
// Check ios sender
215215
expect(iosSender.send).toHaveBeenCalled();
216216
args = iosSender.send.calls.first().args;
217217
expect(args[0]).toEqual(data);
218218
expect(args[1]).toEqual([
219-
makeDevice('iosToken'),
220-
makeDevice('iosToken')
219+
makeDevice('iosToken', 'ios'),
220+
makeDevice('iosToken', 'ios')
221221
]);
222222
done();
223223
});
@@ -281,9 +281,10 @@ describe('ParsePushAdapter', () => {
281281
})
282282
});
283283

284-
function makeDevice(deviceToken, appIdentifier) {
284+
function makeDevice(deviceToken, deviceType, appIdentifier) {
285285
return {
286286
deviceToken: deviceToken,
287+
deviceType: deviceType,
287288
appIdentifier: appIdentifier
288289
};
289290
}

src/PushAdapterUtils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export function classifyInstallations(installations, validPushTypes) {
2121
if (Array.isArray(devices)) {
2222
devices.push({
2323
deviceToken: installation.deviceToken,
24+
deviceType: installation.deviceType,
2425
appIdentifier: installation.appIdentifier
2526
});
2627
}

0 commit comments

Comments
 (0)