Re-fix isObservable() and add test - fixes #29

lib/task.js

@@ -5,10 +5,7 @@ const streamToObservable = require('stream-to-observable');
 const Subject = require('rxjs/Subject').Subject;
 const renderers = require('./renderer');
 const state = require('./state');
-
-const isListr = obj => obj && obj.setRenderer && obj.add && obj.run;
-// https://github.com/sindresorhus/is-observable/issues/1
-const isObservable = obj => obj && typeof obj.subscribe === 'function' && typeof obj.constructor.create === 'function';
+const util = require('./util');
 
 const defaultSkipFn = () => false;
 
@@ -86,7 +83,7 @@ class Task extends Subject {
 	run() {
 		const handleResult = result => {
 			// Detect the subtask
-			if (isListr(result)) {
+			if (util.isListr(result)) {
 				result.setRenderer(renderers.silent);
 				this._subtasks = result.tasks;
 
@@ -103,7 +100,7 @@ class Task extends Subject {
 			}
 
 			// Detect Observable
-			if (isObservable(result)) {
+			if (util.isObservable(result)) {
 				result = new Promise((resolve, reject) => {
 					result.subscribe({
 						next: data => {

lib/util.js

@@ -0,0 +1,8 @@
+'use strict';
+
+const isListr = obj => obj && obj.setRenderer && obj.add && obj.run;
+// https://github.com/sindresorhus/is-observable/issues/1
+const isObservable = obj => obj && typeof obj.subscribe === 'function' && obj.constructor.name === 'Observable';
+
+exports.isListr = isListr;
+exports.isObservable = isObservable;

package.json

@@ -58,7 +58,8 @@
     "clinton": "*",
     "delay": "^1.3.1",
     "hook-std": "^0.2.0",
-    "xo": "*"
+    "xo": "*",
+    "zen-observable": "^0.3.0"
   },
   "xo": {
     "esnext": true

test/util.js

@@ -0,0 +1,21 @@
+import test from 'ava';
+import {Observable as RxObservable} from 'rxjs/Observable';
+import ZenObservable from 'zen-observable';
+import Listr from '../';
+import {isListr, isObservable} from '../lib/util';
+
+test('isListr', t => {
+	t.falsy(isListr(null));
+	t.falsy(isListr({}));
+	t.falsy(isListr(() => {}));
+	t.truthy(isListr(new Listr([])));
+});
+
+test('isObservable', t => {
+	t.falsy(isObservable(null));
+	t.falsy(isObservable({}));
+	t.falsy(isObservable(new Listr([])));
+	t.falsy(isObservable(new Promise(() => {})));
+	t.truthy(isObservable(new RxObservable(() => {})));
+	t.truthy(isObservable(new ZenObservable(() => {})));
+});