browser tests activated

MikeBild · May 30, 2013 · 1fa5adc · 1fa5adc
1 parent a64c7d9
commit 1fa5adc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 40 deletions.
diff --git a/lib/cflow.js b/lib/cflow.js
@@ -9,5 +9,5 @@ var Flow = function(){
 	this.args[0].apply(next);
 }
 
-if (typeof window === "undefined")
+if (typeof window === "undefined" && module && module.exports)
 	module.exports = Flow;
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "node": ">0.8.0"
   },
   "scripts": {
-    "test": "mocha test/spec.js && mocha-phantomjs test/browser/index.html"
+    "test": "mocha && mocha-phantomjs test/browser/index.html"
   },
   "main": "./lib/cflow",
   "author": "Mike Bild",
@@ -23,7 +23,7 @@
   },
    "testling": {
     "browsers": ["chrome/canary"],
-    "files": "test/browser/spec.js"
+    "files": "test/*.js"
   },
   "keywords": [
     "async",

diff --git a/test/browser/spec.js b/test/browser/spec.js
diff --git a/test/spec.js b/test/spec.js
@@ -1,8 +1,11 @@
-if (typeof window === "undefined")
+if (typeof window === "undefined") {
 	var expect = require("chai").expect,
 		Flow = require("../lib/cflow");
-else
+} else if(typeof chai === "undefined") {
+	var expect = require("chai").expect;
+} else {
 	var expect = chai.expect;
+};
 
 describe("cflow", function () {
 	it("sequential", function (done) {