From 6d6f03d2d292f8055e935d3be9dc82aa9c31edd4 Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Thu, 11 Sep 2014 22:54:56 -0700 Subject: [PATCH] resolves #255: upgrade mocha --- package.json | 2 +- test/bootstrap/karma.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 14fadc0a0..a8a79dea7 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ , "karma-mocha": "*" , "karma-sauce-launcher": "0.2.x" , "karma-phantomjs-launcher": "0.1.1" - , "mocha": "1.17.x" + , "mocha": "1.21.x" , "istanbul": "0.2.x" } } diff --git a/test/bootstrap/karma.js b/test/bootstrap/karma.js index 8e3e3f53e..110c6414d 100644 --- a/test/bootstrap/karma.js +++ b/test/bootstrap/karma.js @@ -2,13 +2,13 @@ * Attach chai to global */ -global.chai = require('chai'); +window.chai = require('chai'); /*! * Provide check for fail function. */ -global.err = function (fn, msg) { +window.err = function (fn, msg) { try { fn(); throw new chai.AssertionError('Expected an error');