Merge pull request ReactiveX#2329 from Podlas29/bind-node-callback-no…

…-callback-arguments fix(bindNodeCallback): emit undefined when callback has no success ar…
jayphelps · Feb 14, 2017 · 589b7f6 · 589b7f6
2 parents d23add0 + 8b81fc6
commit 589b7f6
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/spec/observables/bindNodeCallback-spec.ts b/spec/observables/bindNodeCallback-spec.ts
@@ -8,6 +8,24 @@ const Observable = Rx.Observable;
 /** @test {bindNodeCallback} */
 describe('Observable.bindNodeCallback', () => {
   describe('when not scheduled', () => {
+    it('should emit undefined when callback is called without success arguments', () => {
+      function callback(cb) {
+        cb(null);
+      }
+
+      const boundCallback = Observable.bindNodeCallback(callback);
+      const results = [];
+
+      boundCallback()
+        .subscribe((x: any) => {
+          results.push(typeof x);
+        }, null, () => {
+          results.push('done');
+        });
+
+      expect(results).to.deep.equal(['undefined', 'done']);
+    });
+
     it('should emit one value from a callback', () => {
       function callback(datum, cb) {
         cb(null, datum);
@@ -126,6 +144,26 @@ describe('Observable.bindNodeCallback', () => {
   });
 
   describe('when scheduled', () => {
+    it('should emit undefined when callback is called without success arguments', () => {
+      function callback(cb) {
+        cb(null);
+      }
+
+      const boundCallback = Observable.bindNodeCallback(callback, null, rxTestScheduler);
+      const results = [];
+
+      boundCallback()
+        .subscribe((x: any) => {
+          results.push(typeof x);
+        }, null, () => {
+          results.push('done');
+        });
+
+      rxTestScheduler.flush();
+
+      expect(results).to.deep.equal(['undefined', 'done']);
+    });
+
     it('should emit one value from a callback', () => {
       function callback(datum, cb) {
         cb(null, datum);

diff --git a/src/observable/BoundNodeCallbackObservable.ts b/src/observable/BoundNodeCallbackObservable.ts
@@ -112,7 +112,7 @@ export class BoundNodeCallbackObservable<T> extends Observable<T> {
               subject.complete();
             }
           } else {
-            subject.next(innerArgs.length === 1 ? innerArgs[0] : innerArgs);
+            subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
             subject.complete();
           }
         };
@@ -162,7 +162,7 @@ function dispatch<T>(this: Action<DispatchState<T>>, state: DispatchState<T>) {
           self.add(scheduler.schedule(dispatchNext, 0, { value: result, subject }));
         }
       } else {
-        const value = innerArgs.length === 1 ? innerArgs[0] : innerArgs;
+        const value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
         self.add(scheduler.schedule(dispatchNext, 0, { value, subject }));
       }
     };