File tree Expand file tree Collapse file tree 2 files changed +5
-42
lines changed Expand file tree Collapse file tree 2 files changed +5
-42
lines changed Original file line number Diff line number Diff line change @@ -346,8 +346,7 @@ export default class ParsePromise {
346
346
*/
347
347
static when ( promises ) {
348
348
var objects ;
349
- var arrayArgument = Array . isArray ( promises ) ;
350
- if ( arrayArgument ) {
349
+ if ( Array . isArray ( promises ) ) {
351
350
objects = promises ;
352
351
} else {
353
352
objects = arguments ;
@@ -356,13 +355,12 @@ export default class ParsePromise {
356
355
var total = objects . length ;
357
356
var hadError = false ;
358
357
var results = [ ] ;
359
- var returnValue = arrayArgument ? [ results ] : results ;
360
358
var errors = [ ] ;
361
359
results . length = objects . length ;
362
360
errors . length = objects . length ;
363
361
364
362
if ( total === 0 ) {
365
- return ParsePromise . as . apply ( this , returnValue ) ;
363
+ return ParsePromise . as . apply ( this , results ) ;
366
364
}
367
365
368
366
var promise = new ParsePromise ( ) ;
@@ -373,7 +371,7 @@ export default class ParsePromise {
373
371
if ( hadError ) {
374
372
promise . reject ( errors ) ;
375
373
} else {
376
- promise . resolve . apply ( promise , returnValue ) ;
374
+ promise . resolve . apply ( promise , results ) ;
377
375
}
378
376
}
379
377
} ;
Original file line number Diff line number Diff line change @@ -227,7 +227,7 @@ describe('Promise', () => {
227
227
jest . runAllTimers ( ) ;
228
228
} ) ) ;
229
229
230
- it ( 'can handle promises in parallel with array ' , asyncHelper ( function ( done ) {
230
+ it ( 'can handle promises in parallel' , asyncHelper ( function ( done ) {
231
231
var COUNT = 5 ;
232
232
233
233
var delay = function ( ms ) {
@@ -249,42 +249,7 @@ describe('Promise', () => {
249
249
generate ( i ) ;
250
250
}
251
251
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 ( ) {
288
253
expect ( called ) . toBe ( COUNT ) ;
289
254
expect ( COUNT ) . toBe ( arguments . length ) ;
290
255
var actual = arguments ;
You can’t perform that action at this time.
0 commit comments