Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

1.17.0

Travis Jefferyffaa38d49d10
diff --git a/History.md b/History.md
index 6e98ef7d..d8cadebd 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,14 @@
+1.17.0 / 2014-01-09
+==================
+
+ * add: able to require globals (describe, it, etc.) through mocha (#1077)
+ * fix: abort previous run on --watch change (#1100)
+ * fix: reset context for each --watch triggered run (#1099)
+ * fix: error when cli can't resolve path or pattern (#799)
+ * fix: canonicalize objects before stringifying and diffing them (#1079)
+ * fix: make CR call behave like carriage return for non tty (#1087)
+
+
1.16.2 / 2013-12-23
==================
diff --git a/bower.json b/bower.json
index 6e7d52d9..5a452f58 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "mocha",
- "version": "1.16.2",
+ "version": "1.17.0",
"main": "mocha.js",
"ignore": [
"bin",
diff --git a/component.json b/component.json
index d200b2d5..cc589f92 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
{
"name": "mocha",
- "version": "1.16.2",
+ "version": "1.17.0",
"repo": "visionmedia/mocha",
"description": "simple, flexible, fun test framework",
"keywords": [
diff --git a/mocha.js b/mocha.js
index 5bb0ef21..e4f8e6b2 100644
--- a/mocha.js
+++ b/mocha.js
@@ -1437,6 +1437,21 @@ function Mocha(options) {
if (null != options.timeout) this.timeout(options.timeout);
this.useColors(options.useColors)
if (options.slow) this.slow(options.slow);
+
+ this.suite.on('pre-require', function (context) {
+ exports.afterEach = context.afterEach || context.teardown;
+ exports.after = context.after || context.suiteTeardown;
+ exports.beforeEach = context.beforeEach || context.setup;
+ exports.before = context.before || context.suiteSetup;
+ exports.describe = context.describe || context.suite;
+ exports.it = context.it || context.test;
+ exports.setup = context.setup || context.beforeEach;
+ exports.suiteSetup = context.suiteSetup || context.before;
+ exports.suiteTeardown = context.suiteTeardown || context.after;
+ exports.suite = context.suite || context.describe;
+ exports.teardown = context.teardown || context.afterEach;
+ exports.test = context.test || context.it;
+ });
}
/**
@@ -1977,7 +1992,7 @@ exports.cursor = {
exports.cursor.deleteLine();
exports.cursor.beginningOfLine();
} else {
- process.stdout.write('\n');
+ process.stdout.write('\r');
}
}
};
diff --git a/package.json b/package.json
index 99d3425f..4ae39e62 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "mocha",
- "version": "1.16.2",
+ "version": "1.17.0",
"description": "simple, flexible, fun test framework",
"keywords": [
"mocha",