From 74fb6c506aeffec17e9f56dc8bbf0a9d7bf6a274 Mon Sep 17 00:00:00 2001
From: Oscar Busk <oscar.busk@gmail.com>
Date: Wed, 17 Oct 2018 22:07:56 +0200
Subject: [PATCH] Fix mergeAll having wrong returntype (#29820)

---
 types/rx-lite/index.d.ts       | 4 ++--
 types/rx-lite/rx-lite-tests.ts | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/types/rx-lite/index.d.ts b/types/rx-lite/index.d.ts
index 16646b0473..9487683dce 100644
--- a/types/rx-lite/index.d.ts
+++ b/types/rx-lite/index.d.ts
@@ -244,8 +244,8 @@ declare namespace Rx {
         merge(maxConcurrent: number): T;
         merge(other: Observable<T>): Observable<T>;
         merge(other: IPromise<T>): Observable<T>;
-        mergeAll(): Observable<T>;
-        mergeObservable(): Observable<T>;    // alias for mergeAll
+        mergeAll(): T;
+        mergeObservable(): T;    // alias for mergeAll
         skipUntil<T2>(other: Observable<T2>): Observable<T>;
         skipUntil<T2>(other: IPromise<T2>): Observable<T>;
         switch(): T;
diff --git a/types/rx-lite/rx-lite-tests.ts b/types/rx-lite/rx-lite-tests.ts
index 17f0bbe726..755a2b2443 100644
--- a/types/rx-lite/rx-lite-tests.ts
+++ b/types/rx-lite/rx-lite-tests.ts
@@ -86,14 +86,19 @@ function test_concatAll() {
 		});
 }
 
+// https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/core/operators/mergeall.md
 function test_mergeAll() {
-	/* mergeAll example */
+    /* mergeAll example */
+
+    // $ExpectType Observable<number>
 	const source = Rx.Observable.range(0, 3)
 		.map(x => Rx.Observable.range(x, 3))
-		.mergeAll();
+        .mergeAll();
 
 	const subscription = source.subscribe(
 		x => {
+            // $ExpectType number
+            x;
 			console.log('Next: %s', x);
 		},
 		err => {