☕️ Classic, reliable, trusted test framework for Node.js and the browser
Replaces util.escapeRegexp by the escape-string-regexp package.
Joshua Appelmanfd6bcc583c8e
diff --git a/lib/interfaces/bdd.js b/lib/interfaces/bdd.jsindex ebf6f0f4..ef53639d 100644--- a/lib/interfaces/bdd.js+++ b/lib/interfaces/bdd.js@@ -5,7 +5,8 @@var Suite = require('../suite'), Test = require('../test')- , utils = require('../utils');+ , utils = require('../utils')+ , escapeRe = require('escape-string-regexp');/*** BDD-style interface:@@ -121,7 +122,7 @@ module.exports = function(suite){context.it.only = function(title, fn){var test = context.it(title, fn);- var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';+ var reString = '^' + escapeRe(test.fullTitle()) + '$';mocha.grep(new RegExp(reString));return test;};diff --git a/lib/interfaces/qunit.js b/lib/interfaces/qunit.jsindex 02d50070..0a22641c 100644--- a/lib/interfaces/qunit.js+++ b/lib/interfaces/qunit.js@@ -5,6 +5,7 @@var Suite = require('../suite'), Test = require('../test')+ , escapeRe = require('escape-string-regexp'), utils = require('../utils');/**@@ -109,7 +110,7 @@ module.exports = function(suite){context.test.only = function(title, fn){var test = context.test(title, fn);- var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';+ var reString = '^' + escapeRe(test.fullTitle()) + '$';mocha.grep(new RegExp(reString));};diff --git a/lib/interfaces/tdd.js b/lib/interfaces/tdd.jsindex 6d0c3d6e..ce43cd28 100644--- a/lib/interfaces/tdd.js+++ b/lib/interfaces/tdd.js@@ -5,6 +5,7 @@var Suite = require('../suite'), Test = require('../test')+ , escapeRe = require('escape-string-regexp'), utils = require('../utils');;/**@@ -125,7 +126,7 @@ module.exports = function(suite){context.test.only = function(title, fn){var test = context.test(title, fn);- var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';+ var reString = '^' + escapeRe(test.fullTitle()) + '$';mocha.grep(new RegExp(reString));};diff --git a/lib/mocha.js b/lib/mocha.jsindex 7bfc42f4..73bdaf97 100644--- a/lib/mocha.js+++ b/lib/mocha.js@@ -9,6 +9,7 @@*/var path = require('path')+ , escapeRe = require('escape-string-regexp'), utils = require('./utils');/**@@ -220,7 +221,7 @@ Mocha.prototype._growl = function(runner, reporter) {Mocha.prototype.grep = function(re){this.options.grep = 'string' == typeof re- ? new RegExp(utils.escapeRegexp(re))+ ? new RegExp(escapeRe(re)): re;return this;};diff --git a/lib/utils.js b/lib/utils.jsindex 77682443..f0dea1c0 100644--- a/lib/utils.js+++ b/lib/utils.js@@ -227,18 +227,6 @@ exports.clean = function(str) {return exports.trim(str);};-/**- * Escape regular expression characters in `str`.- *- * @param {String} str- * @return {String}- * @api private- */--exports.escapeRegexp = function(str){- return str.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&");-};-/*** Trim the given `str`.*diff --git a/mocha.js b/mocha.jsindex 7a2ad94f..e80b4ca2 100644--- a/mocha.js+++ b/mocha.js@@ -902,7 +902,8 @@ require.register("interfaces/bdd.js", function(module, exports, require){var Suite = require('../suite'), Test = require('../test')- , utils = require('../utils');+ , utils = require('../utils')+ , escapeRe = require('escape-string-regexp');/*** BDD-style interface:@@ -1018,7 +1019,7 @@ module.exports = function(suite){context.it.only = function(title, fn){var test = context.it(title, fn);- var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';+ var reString = '^' + escapeRe(test.fullTitle()) + '$';mocha.grep(new RegExp(reString));return test;};@@ -1120,6 +1121,7 @@ require.register("interfaces/qunit.js", function(module, exports, require){var Suite = require('../suite'), Test = require('../test')+ , escapeRe = require('escape-string-regexp'), utils = require('../utils');/**@@ -1224,7 +1226,7 @@ module.exports = function(suite){context.test.only = function(title, fn){var test = context.test(title, fn);- var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';+ var reString = '^' + escapeRe(test.fullTitle()) + '$';mocha.grep(new RegExp(reString));};@@ -1248,6 +1250,7 @@ require.register("interfaces/tdd.js", function(module, exports, require){var Suite = require('../suite'), Test = require('../test')+ , escapeRe = require('escape-string-regexp'), utils = require('../utils');;/**@@ -1368,7 +1371,7 @@ module.exports = function(suite){context.test.only = function(title, fn){var test = context.test(title, fn);- var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';+ var reString = '^' + escapeRe(test.fullTitle()) + '$';mocha.grep(new RegExp(reString));};@@ -1396,6 +1399,7 @@ require.register("mocha.js", function(module, exports, require){*/var path = require('browser/path')+ , escapeRe = require('escape-string-regexp'), utils = require('./utils');/**@@ -1607,7 +1611,7 @@ Mocha.prototype._growl = function(runner, reporter) {Mocha.prototype.grep = function(re){this.options.grep = 'string' == typeof re- ? new RegExp(utils.escapeRegexp(re))+ ? new RegExp(escapeRe(re)): re;return this;};@@ -5723,18 +5727,6 @@ exports.clean = function(str) {return exports.trim(str);};-/**- * Escape regular expression characters in `str`.- *- * @param {String} str- * @return {String}- * @api private- */--exports.escapeRegexp = function(str){- return str.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&");-};-/*** Trim the given `str`.*diff --git a/package.json b/package.jsonindex a8dd6a27..8239be3b 100644--- a/package.json+++ b/package.json@@ -42,7 +42,8 @@"diff": "1.0.7","debug": "*","mkdirp": "0.3.5",- "glob": "3.2.3"+ "glob": "3.2.3",+ "escape-string-regexp": "1.0.1"},"devDependencies": {"coffee-script": "~1.7.1",