closes #94 generators support

Author: kof

lib/child.js

@@ -2,7 +2,9 @@ var QUnit = require('qunitjs'),
     path = require('path'),
     _ = require('underscore'),
     trace = require('tracejs').trace,
-    coverage = require('./coverage');
+    coverage = require('./coverage'),
+    generators = require('./generators'),
+    co = require('co');
 
 // cycle.js: This file contains two functions, JSON.decycle and JSON.retrocycle,
 // which make it possible to encode cyclical structures and dags in JSON, and to
@@ -107,6 +109,34 @@ QUnit.done(_.debounce(function(data) {
     });
 }, 1000));
 
+if (generators.support) {
+    var test = QUnit.test;
+
+    /**
+     * Support generators.
+     */
+    global.test = QUnit.test = function(testName, expected, callback, async) {
+        var fn;
+
+        if ( arguments.length === 2 ) {
+            callback = expected;
+            expected = null;
+        }
+
+        if (generators.isGeneratorFn(callback)) {
+            fn = function() {
+                stop();
+                co(callback)();
+                start();
+            };
+        } else {
+            fn = callback;
+        }
+
+        return test.call(this, testName, expected, fn, async);
+    };
+}
+
 /**
  * Provide better stack traces
  */

lib/generators.js

@@ -0,0 +1,21 @@
+'use strict'
+
+/**
+ * Is true when generators are supported.
+ */
+exports.support = false;
+
+try {
+  eval("(function *(){})()");
+  exports.support = true;
+} catch(err) {}
+
+/**
+ * Returns true if function is a generator fn.
+ *
+ * @param {Function} fn
+ * @return {Boolean}
+ */
+exports.isGeneratorFn = function(fn) {
+    return fn.constructor.name == 'GeneratorFunction';
+}

package.json

@@ -1,41 +1,59 @@
 {
-    "name": "qunit",
-    "description": "QUnit testing framework for nodejs",
-    "version": "0.6.4",
-    "author": "Oleg Slobodskoi <oleg008@gmail.com>",
-    "contributors": [
-        {"name": "Jonathan Buchanan"},
-        {"name": "Ashar Voultoiz"},
-        {"name": "Drew Fyock"}
-    ],
-    "repository": {
-        "type": "git",
-        "url": "http://github.com/kof/node-qunit.git"
+  "name": "qunit",
+  "description": "QUnit testing framework for nodejs",
+  "version": "0.7.0",
+  "author": "Oleg Slobodskoi <oleg008@gmail.com>",
+  "contributors": [
+    {
+      "name": "Jonathan Buchanan"
     },
-    "keywords": ["TDD", "QUnit", "unit", "testing", "tests", "async"],
-    "bin": {"qunit": "./bin/cli.js"},
-    "engines": {"node": ">=0.6.0 < 0.11.0"},
-    "scripts": {
-        "test": "node ./test/testrunner.js"
+    {
+      "name": "Ashar Voultoiz"
     },
-    "dependencies": {
-        "underscore": "^1.6.0",
-        "argsparser": "^0.0.6",
-        "cli-table": "^0.3.0",
-        "tracejs": "^0.1.8",
-        "qunitjs": "1.10.0"
-    },
-    "devDependencies": {
-        "chainer": "^0.0.5",
-        "timekeeper": "^0.0.4"
-    },
-    "optionalDependencies": {
-        "istanbul": "^0.2.4"
-    },
-    "licenses": [
-        {
-           "type": "MIT",
-           "url": "http: //www.opensource.org/licenses/mit-license.php"
-        }
-    ]
+    {
+      "name": "Drew Fyock"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/kof/node-qunit.git"
+  },
+  "keywords": [
+    "TDD",
+    "QUnit",
+    "unit",
+    "testing",
+    "tests",
+    "async"
+  ],
+  "bin": {
+    "qunit": "./bin/cli.js"
+  },
+  "engines": {
+    "node": ">=0.6.0 < 0.12.0"
+  },
+  "scripts": {
+    "test": "node --harmony ./test/testrunner.js"
+  },
+  "dependencies": {
+    "argsparser": "^0.0.6",
+    "cli-table": "^0.3.0",
+    "co": "^3.0.6",
+    "qunitjs": "1.10.0",
+    "tracejs": "^0.1.8",
+    "underscore": "^1.6.0"
+  },
+  "devDependencies": {
+    "chainer": "^0.0.5",
+    "timekeeper": "^0.0.4"
+  },
+  "optionalDependencies": {
+    "istanbul": "https://github.com/gotwarlost/istanbul/tarball/harmony"
+  },
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "http: //www.opensource.org/licenses/mit-license.php"
+    }
+  ]
 }

readme.md

@@ -15,6 +15,7 @@ http://github.com/jquery/qunit
 - the simplest API of the world, especially for asynchronous testing
 - you can write tests in TDD or BDD style depending on your task and test type
 - you can run the same tests in browser if there is no dependencies to node
+- generators support
 
 ### Installation
 
@@ -176,19 +177,19 @@ QUnit API and code which have to be tested are already loaded and attached to th
 Some tests examples
 
 
-    test("a basic test example", function (assert) {
+    test("a basic test example", function () {
         ok(true, "this test is fine");
         var value = "hello";
         equal("hello", value, "We expect value to be hello");
     });
 
     QUnit.module("Module A");
 
-    test("first test within module", 1, function (assert) {
+    test("first test within module", 1, function () {
         ok(true, "a dummy");
     });
 
-    test("second test within module", 2, function (assert) {
+    test("second test within module", 2, function () {
         ok(true, "dummy 1 of 2");
         ok(true, "dummy 2 of 2");
     });
@@ -202,7 +203,7 @@ Some tests examples
         }
     });
 
-    test("some other test", function (assert) {
+    test("some other test", function () {
         expect(2);
         equal(true, false, "failing test");
         equal(true, true, "passing test");
@@ -215,11 +216,11 @@ Some tests examples
         }
     });
 
-    test("this test is using shared environment", 1, function (assert) {
+    test("this test is using shared environment", 1, function () {
         deepEqual({ test: 123 }, this.options, "passing test");
     });
 
-    test("this is an async test example", function (assert) {
+    test("this is an async test example", function () {
         expect(2);
         stop();
         setTimeout(function () {
@@ -229,6 +230,12 @@ Some tests examples
         }, 100);
     });
 
+### Generators support
+
+    test("my async test with generators", function* () {
+        var data = yield asyncFn();
+        equal(data, {a: 1}, 'generators work');
+    });
 
 ### Run tests
 

test/fixtures/generators-code.js

@@ -0,0 +1,5 @@
+exports.getMyGen = function() {
+    return function* () {
+        return yield {a: 1};
+    };
+};

test/fixtures/generators-test.js

@@ -0,0 +1,4 @@
+test('generators', function* () {
+    var data = yield getMyGen();
+    deepEqual(data, {a: 1}, 'woks');
+});

test/testrunner.js

@@ -3,7 +3,8 @@ var a = require('assert'),
     _ = require('underscore');
 
 var tr = require('../lib/testrunner'),
-    log = require('../lib/log');
+    log = require('../lib/log'),
+    generators = require('../lib/generators');
 
 var fixtures = __dirname + '/fixtures',
     chain = chainer();
@@ -175,10 +176,33 @@ chain.add('coverage', function() {
         delete res.runtime;
         a.equal(err, null, 'no errors');
         a.deepEqual(stat, res, 'coverage code testing works');
+        tr.options.coverage = false;
         chain.next();
     });
 });
 
+if (generators.support) {
+    chain.add('generators', function() {
+        tr.run({
+            code: fixtures + '/generators-code.js',
+            tests: fixtures + '/generators-test.js'
+        }, function(err, res) {
+            var stat = {
+                files: 1,
+                tests: 1,
+                assertions: 1,
+                failed: 0,
+                passed: 1
+            };
+            delete res.runtime;
+            delete res.coverage;
+            a.equal(err, null, 'no errors');
+            a.deepEqual(stat, res, 'coverage code testing works');
+            chain.next();
+        });
+    });
+}
+
 chain.add(function() {
     console.log('\nAll tests ok.');
 });