Skip to content

Commit f4da94c

Browse files
committed
Revert "Make sure when argument corresponds with then arguments"
1 parent 134839d commit f4da94c

File tree

2 files changed

+5
-42
lines changed

2 files changed

+5
-42
lines changed

src/ParsePromise.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,7 @@ export default class ParsePromise {
346346
*/
347347
static when(promises) {
348348
var objects;
349-
var arrayArgument = Array.isArray(promises);
350-
if (arrayArgument) {
349+
if (Array.isArray(promises)) {
351350
objects = promises;
352351
} else {
353352
objects = arguments;
@@ -356,13 +355,12 @@ export default class ParsePromise {
356355
var total = objects.length;
357356
var hadError = false;
358357
var results = [];
359-
var returnValue = arrayArgument ? [results] : results;
360358
var errors = [];
361359
results.length = objects.length;
362360
errors.length = objects.length;
363361

364362
if (total === 0) {
365-
return ParsePromise.as.apply(this, returnValue);
363+
return ParsePromise.as.apply(this, results);
366364
}
367365

368366
var promise = new ParsePromise();
@@ -373,7 +371,7 @@ export default class ParsePromise {
373371
if (hadError) {
374372
promise.reject(errors);
375373
} else {
376-
promise.resolve.apply(promise, returnValue);
374+
promise.resolve.apply(promise, results);
377375
}
378376
}
379377
};

src/__tests__/ParsePromise-test.js

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ describe('Promise', () => {
227227
jest.runAllTimers();
228228
}));
229229

230-
it('can handle promises in parallel with array', asyncHelper(function(done) {
230+
it('can handle promises in parallel', asyncHelper(function(done) {
231231
var COUNT = 5;
232232

233233
var delay = function(ms) {
@@ -249,42 +249,7 @@ describe('Promise', () => {
249249
generate(i);
250250
}
251251

252-
ParsePromise.when(promises).then(function(results) {
253-
expect(called).toBe(COUNT);
254-
expect(COUNT).toBe(results.length);
255-
var actual = results;
256-
for (var i = 0; i < actual.length; i++) {
257-
expect(actual[i]).toBe(5 * i);
258-
}
259-
done();
260-
});
261-
262-
jest.runAllTimers();
263-
}));
264-
265-
it('can handle promises in parallel with arguments', asyncHelper(function(done) {
266-
var COUNT = 5;
267-
268-
var delay = function(ms) {
269-
var promise = new ParsePromise();
270-
setTimeout(() => { promise.resolve(); }, ms);
271-
return promise;
272-
};
273-
274-
var called = 0;
275-
var promises = [];
276-
function generate(i) {
277-
promises[i] = delay((i % 2) ? (i * 10) : (COUNT * 10) - (i * 10)).then(
278-
function() {
279-
called++;
280-
return 5 * i;
281-
});
282-
}
283-
for (var i = 0; i < COUNT; i++) {
284-
generate(i);
285-
}
286-
287-
ParsePromise.when.apply(null, promises).then(function() {
252+
ParsePromise.when(promises).then(function() {
288253
expect(called).toBe(COUNT);
289254
expect(COUNT).toBe(arguments.length);
290255
var actual = arguments;

0 commit comments

Comments
 (0)