☕️ Classic, reliable, trusted test framework for Node.js and the browser
clean up HTML escape() usage
TJ Holowaychuk98bc45461e88
diff --git a/lib/reporters/html.js b/lib/reporters/html.jsindex 7656d157..5ca4ed72 100644--- a/lib/reporters/html.js+++ b/lib/reporters/html.js@@ -94,18 +94,18 @@ function HTML(runner) {// testif ('passed' == test.state) {- var el = fragment('<div class="test pass"><h2>%s</h2></div>', escape(test.title));+ var el = fragment('<div class="test pass"><h2>%e</h2></div>', test.title);} else if (test.pending) {- var el = fragment('<div class="test pass pending"><h2>%s</h2></div>', escape(test.title));+ var el = fragment('<div class="test pass pending"><h2>%e</h2></div>', test.title);} else {- var el = fragment('<div class="test fail"><h2>%s</h2></div>', escape(test.title));+ var el = fragment('<div class="test fail"><h2>%e</h2></div>', test.title);var str = test.err.stack || test.err;// <=IE7 stringifies to [Object Error]. Since it can be overloaded, we// check for the result of the stringifying.if ('[object Error]' == str) str = test.err.message;- el.appendChild(fragment('<pre class="error">%s</pre>', escape(str)));+ el.appendChild(fragment('<pre class="error">%e</pre>', str));}// toggle code@@ -120,8 +120,7 @@ function HTML(runner) {// code// TODO: deferif (!test.pending) {- var code = escape(clean(test.fn.toString()));- var pre = fragment('<pre><code>%s</code></pre>', code);+ var pre = fragment('<pre><code>%e</code></pre>', clean(test.fn.toString()));el.appendChild(pre);pre.style.display = 'none';}@@ -147,8 +146,11 @@ function fragment(html) {, div = document.createElement('div'), i = 1;- div.innerHTML = html.replace(/%s/g, function(){- return args[i++];+ div.innerHTML = html.replace(/%([se])/g, function(_, type){+ switch (type) {+ case 's': return String(args[i++]);+ case 'e': return escape(args[i++]);+ }});return div.firstChild;diff --git a/mocha.js b/mocha.jsindex e310e98a..176abc8b 100644--- a/mocha.js+++ b/mocha.js@@ -1483,18 +1483,18 @@ function HTML(runner) {// testif ('passed' == test.state) {- var el = fragment('<div class="test pass"><h2>%s</h2></div>', escape(test.title));+ var el = fragment('<div class="test pass"><h2>%e</h2></div>', test.title);} else if (test.pending) {- var el = fragment('<div class="test pass pending"><h2>%s</h2></div>', escape(test.title));+ var el = fragment('<div class="test pass pending"><h2>%e</h2></div>', test.title);} else {- var el = fragment('<div class="test fail"><h2>%s</h2></div>', escape(test.title));+ var el = fragment('<div class="test fail"><h2>%e</h2></div>', test.title);var str = test.err.stack || test.err;// <=IE7 stringifies to [Object Error]. Since it can be overloaded, we// check for the result of the stringifying.if ('[object Error]' == str) str = test.err.message;- el.appendChild(fragment('<pre class="error">%s</pre>', escape(str)));+ el.appendChild(fragment('<pre class="error">%e</pre>', str));}// toggle code@@ -1509,8 +1509,7 @@ function HTML(runner) {// code// TODO: deferif (!test.pending) {- var code = escape(clean(test.fn.toString()));- var pre = fragment('<pre><code>%s</code></pre>', code);+ var pre = fragment('<pre><code>%e</code></pre>', clean(test.fn.toString()));el.appendChild(pre);pre.style.display = 'none';}@@ -1536,8 +1535,11 @@ function fragment(html) {, div = document.createElement('div'), i = 1;- div.innerHTML = html.replace(/%s/g, function(){- return args[i++];+ div.innerHTML = html.replace(/%([se])/g, function(_, type){+ switch (type) {+ case 's': return String(args[i++]);+ case 'e': return escape(args[i++]);+ }});return div.firstChild;