Skip to content

armgit / mocha

Public Imported from GitHub
0

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

Replaces escapeRegexp with the escape-string-regexp package.

Joshua Appelmand4e779834063
diff --git a/Makefile b/Makefile
index 3e867826..4e60a768 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,10 @@ all: mocha.js
lib/browser/diff.js: node_modules/diff/diff.js
cp node_modules/diff/diff.js lib/browser/diff.js
-mocha.js: $(SRC) $(SUPPORT) lib/browser/diff.js
+lib/browser/escape-string-regexp.js: node_modules/escape-string-regexp/index.js
+ cp node_modules/escape-string-regexp/index.js lib/browser/escape-string-regexp.js
+
+mocha.js: $(SRC) $(SUPPORT) lib/browser/diff.js lib/browser/escape-string-regexp.js
@node support/compile $(SRC)
@cat \
support/head.js \
diff --git a/lib/browser/escape-string-regexp.js b/lib/browser/escape-string-regexp.js
new file mode 100644
index 00000000..ac6572ca
--- /dev/null
+++ b/lib/browser/escape-string-regexp.js
@@ -0,0 +1,11 @@
+'use strict';
+
+var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+
+module.exports = function (str) {
+ if (typeof str !== 'string') {
+ throw new TypeError('Expected a string');
+ }
+
+ return str.replace(matchOperatorsRe, '\\$&');
+};
diff --git a/lib/interfaces/bdd.js b/lib/interfaces/bdd.js
index 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.js
index 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.js
index 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.js
index 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.js
index 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.js
index 7a2ad94f..5bab72bc 100644
--- a/mocha.js
+++ b/mocha.js
@@ -414,6 +414,21 @@ if (typeof module !== 'undefined') {
}); // module: browser/diff.js
+require.register("browser/escape-string-regexp.js", function(module, exports, require){
+'use strict';
+
+var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+
+module.exports = function (str) {
+ if (typeof str !== 'string') {
+ throw new TypeError('Expected a string');
+ }
+
+ return str.replace(matchOperatorsRe, '\\$&');
+};
+
+}); // module: browser/escape-string-regexp.js
+
require.register("browser/events.js", function(module, exports, require){
/**
@@ -902,7 +917,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 +1034,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 +1136,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 +1241,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 +1265,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 +1386,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 +1414,7 @@ require.register("mocha.js", function(module, exports, require){
*/
var path = require('browser/path')
+ , escapeRe = require('escape-string-regexp')
, utils = require('./utils');
/**
@@ -1607,7 +1626,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 +5742,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.json
index e9ec1c6f..f0e17a1e 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"commander": "2.3.0",
"debug": "2.0.0",
"diff": "1.0.8",
+ "escape-string-regexp": "1.0.1",
"glob": "3.2.3",
"growl": "1.8.1",
"jade": "0.26.3",
diff --git a/support/compile.js b/support/compile.js
index 39a53222..98552723 100644
--- a/support/compile.js
+++ b/support/compile.js
@@ -43,12 +43,13 @@ function parse(js) {
function parseRequires(js) {
return js
- .replace(/require\('events'\)/g, "require('browser/events')")
- .replace(/require\('debug'\)/g, "require('browser/debug')")
- .replace(/require\('path'\)/g, "require('browser/path')")
- .replace(/require\('diff'\)/g, "require('browser/diff')")
- .replace(/require\('tty'\)/g, "require('browser/tty')")
- .replace(/require\('fs'\)/g, "require('browser/fs')")
+ .replace(/require\('events'\)/g , "require('browser/events')")
+ .replace(/require\('debug'\)/g , "require('browser/debug')")
+ .replace(/require\('path'\)/g , "require('browser/path')")
+ .replace(/require\('diff'\)/g , "require('browser/diff')")
+ .replace(/require\('tty'\)/g , "require('browser/tty')")
+ .replace(/require\('escape-string-regexp'\)/g , "require('browser/escape-string-regexp')")
+ .replace(/require\('fs'\)/g , "require('browser/fs')");
}
/**