Comparing version 0.10.25 to 0.10.26
{ | ||
"name": "derby", | ||
"description": "MVC framework making it easy to write realtime, collaborative applications that run in both Node.js and browsers.", | ||
"version": "0.10.25", | ||
"version": "0.10.26", | ||
"homepage": "http://derbyjs.com/", | ||
@@ -6,0 +6,0 @@ "repository": { |
@@ -9,4 +9,4 @@ var util = require('racer').util; | ||
exports.install = function() { | ||
runner.installMochaHooks(); | ||
exports.install = function(options) { | ||
runner.installMochaHooks(options); | ||
return runner; | ||
@@ -21,6 +21,11 @@ }; | ||
DomTestRunner.prototype.installMochaHooks = function() { | ||
DomTestRunner.prototype.installMochaHooks = function(options) { | ||
options = options || {}; | ||
var jsdomOptions = options.jsdomOptions; | ||
// Set up runner's `window` and `document`. | ||
if (util.isServer) { | ||
mochaHooksForNode(this); | ||
mochaHooksForNode(this, { | ||
jsdomOptions: jsdomOptions | ||
}); | ||
} else { | ||
@@ -39,3 +44,5 @@ mochaHooksForBrowser(this); | ||
function mochaHooksForNode(runner) { | ||
function mochaHooksForNode(runner, options) { | ||
var jsdomOptions = options.jsdomOptions; | ||
// Use an indirect require so that Browserify doesn't try to bundle JSDOM. | ||
@@ -49,3 +56,3 @@ var JSDOM = util.serverRequire(module, 'jsdom').JSDOM; | ||
global.beforeEach(function() { | ||
jsdom = new JSDOM(); | ||
jsdom = new JSDOM('', jsdomOptions); | ||
runner.window = jsdom.window; | ||
@@ -52,0 +59,0 @@ runner.document = jsdom.window.document; |
217621
47
5660