Skip to content

Commit 197cc75

Browse files
yomexzoKrinkle
authored andcommitted
Bump qunitjs version to 1.23.1
* Fix bugs in child.js due to qunit upgrade. Fixes #110 Closes #132
1 parent cf7a013 commit 197cc75

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

lib/child.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ setInterval(function() {
2727
process.on('uncaughtException', function(err) {
2828
if (QUnit.config.current) {
2929
QUnit.ok(false, 'Test threw unexpected exception: ' + err.message);
30-
QUnit.start();
3130
}
3231
process.send({
3332
event: 'uncaughtException',
@@ -38,9 +37,6 @@ process.on('uncaughtException', function(err) {
3837
});
3938
});
4039

41-
QUnit.config.autorun = false;
42-
QUnit.config.autostart = false;
43-
4440
// make qunit api global, like it is in the browser
4541
_.extend(global, QUnit);
4642

@@ -62,8 +58,6 @@ function _require(res, addToGlobal) {
6258
_.extend(global, exports);
6359
}
6460
}
65-
66-
QUnit.start();
6761
}
6862

6963
/**
@@ -83,7 +77,7 @@ QUnit.testStart(function(test) {
8377
* @param {Object} data
8478
*/
8579
QUnit.log(function(data) {
86-
data.test = this.config.current.testName;
80+
data.test = QUnit.config.current.testName;
8781
data.module = currentModule;
8882
process.send({
8983
event: 'assertionDone',
@@ -177,3 +171,4 @@ options.tests.forEach(function(test) {
177171
_require(test, false);
178172
});
179173

174+
QUnit.load();

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"argsparser": "^0.0.6",
4040
"cli-table": "^0.3.0",
4141
"co": "^3.0.6",
42-
"qunitjs": "1.10.0",
42+
"qunitjs": "1.23.1",
4343
"tracejs": "^0.1.8",
4444
"underscore": "^1.6.0"
4545
},

0 commit comments

Comments
 (0)