fix(race): support array of observables other than rest param

ReactiveX · Apr 11, 2017 · 47f15dd · 47f15dd
1 parent dc2e7f1
commit 47f15dd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/spec/observables/race-spec.ts b/spec/observables/race-spec.ts
@@ -35,6 +35,20 @@ describe('Observable.race', () => {
     expectSubscriptions(e2.subscriptions).toBe(e2subs);
   });
 
+  it('should race with array of observable', () => {
+    const e1 =  cold('---a-----b-----c----|');
+    const e1subs =   '^                   !';
+    const e2 =  cold('------x-----y-----z----|');
+    const e2subs =   '^  !';
+    const expected = '---a-----b-----c----|';
+
+    const result = Observable.race([e1, e2]);
+
+    expectObservable(result).toBe(expected);
+    expectSubscriptions(e1.subscriptions).toBe(e1subs);
+    expectSubscriptions(e2.subscriptions).toBe(e2subs);
+  });
+
   it('should race hot and hot', () => {
     const e1 =   hot('---a-----b-----c----|');
     const e1subs =   '^                   !';

diff --git a/src/operator/race.ts b/src/operator/race.ts
@@ -9,8 +9,10 @@ import { InnerSubscriber } from '../InnerSubscriber';
 import { subscribeToResult } from '../util/subscribeToResult';
 
 /* tslint:disable:max-line-length */
+export function race<T>(this: Observable<T>, observables: Array<Observable<T>>): Observable<T>;
+export function race<T, R>(this: Observable<T>, observables: Array<Observable<T>>): Observable<R>;
 export function race<T>(this: Observable<T>, ...observables: Array<Observable<T> | Array<Observable<T>>>): Observable<T>;
-export function race<T, R>(this: Observable<T>, ...observables: Array<Observable<any> | Array<Observable<T>>>): Observable<R>;
+export function race<T, R>(this: Observable<T>, ...observables: Array<Observable<any> | Array<Observable<any>>>): Observable<R>;
 /* tslint:enable:max-line-length */
 
 /**
@@ -39,10 +41,12 @@ export function race<T>(this: Observable<T>, ...observables: Array<Observable<T>
  * @name race
  * @owner Observable
  */
+export function raceStatic<T>(observables: Array<Observable<T>>): Observable<T>;
+export function raceStatic<T>(observables: Array<Observable<any>>): Observable<T>;
 export function raceStatic<T>(...observables: Array<Observable<T> | Array<Observable<T>>>): Observable<T>;
 export function raceStatic<T>(...observables: Array<Observable<any> | Array<Observable<any>>>): Observable<T> {
   // if the only argument is an array, it was most likely called with
-  // `pair([obs1, obs2, ...])`
+  // `race([obs1, obs2, ...])`
   if (observables.length === 1) {
     if (isArray(observables[0])) {
       observables = <Array<Observable<any>>>observables[0];