Merge pull request #256 from khoomeister/master

nzakas · nzakas · commit d2e1d5bf5627 · 2012-04-13T07:47:16.000-07:00
Fixed escapeSpecialCharacters to check for ampersands
diff --git a/src/formatters/checkstyle-xml.js b/src/formatters/checkstyle-xml.js
@@ -50,6 +50,7 @@ CSSLint.addFormatter({
          *
          * Rules:
          *  - single quotes is the escape sequence for double-quotes
+         *  - &amp; is the escape sequence for &
          *  - &lt; is the escape sequence for <
          *  - &gt; is the escape sequence for >
          *
@@ -60,7 +61,7 @@ CSSLint.addFormatter({
             if (!str || str.constructor !== String) {
                 return "";
             }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            return str.replace(/\"/g, "'").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
         };
 
         if (messages.length > 0) {
diff --git a/src/formatters/csslint-xml.js b/src/formatters/csslint-xml.js
@@ -36,6 +36,7 @@ CSSLint.addFormatter({
          *
          * Rules:
          *  - single quotes is the escape sequence for double-quotes
+         *  - &amp; is the escape sequence for &
          *  - &lt; is the escape sequence for <
          *  - &gt; is the escape sequence for >
          * 
@@ -46,7 +47,7 @@ CSSLint.addFormatter({
             if (!str || str.constructor !== String) {
                 return "";
             }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            return str.replace(/\"/g, "'").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
         };
 
         if (messages.length > 0) {
diff --git a/src/formatters/lint-xml.js b/src/formatters/lint-xml.js
@@ -36,6 +36,7 @@ CSSLint.addFormatter({
          *
          * Rules:
          *  - single quotes is the escape sequence for double-quotes
+         *  - &amp; is the escape sequence for &
          *  - &lt; is the escape sequence for <
          *  - &gt; is the escape sequence for >
          * 
@@ -46,7 +47,7 @@ CSSLint.addFormatter({
             if (!str || str.constructor !== String) {
                 return "";
             }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            return str.replace(/\"/g, "'").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
         };
 
         if (messages.length > 0) {
diff --git a/tests/formatters/checkstyle-xml.js b/tests/formatters/checkstyle-xml.js
@@ -27,14 +27,14 @@
         },
 
         "Formatter should escape special characters": function() {
-            var specialCharsSting = 'sneaky, "sneaky", <sneaky>',
+            var specialCharsSting = 'sneaky, "sneaky", <sneaky>, sneak & sneaky',
                 result = { messages: [
                      { type: "warning", line: 1, col: 1, message: specialCharsSting, evidence: "ALSO BOGUS", rule: [] },
                      { type: "error", line: 2, col: 1, message: specialCharsSting, evidence: "ALSO BOGUS", rule: [] }
                 ], stats: [] },
                 file = "<file name=\"FILE\">",
-                error1 = "<error line=\"1\" column=\"1\" severity=\"warning\" message=\"sneaky, 'sneaky', &lt;sneaky&gt;\" source=\"\"/>",
-                error2 = "<error line=\"2\" column=\"1\" severity=\"error\" message=\"sneaky, 'sneaky', &lt;sneaky&gt;\" source=\"\"/>",
+                error1 = "<error line=\"1\" column=\"1\" severity=\"warning\" message=\"sneaky, 'sneaky', &lt;sneaky&gt;, sneak &amp; sneaky\" source=\"\"/>",
+                error2 = "<error line=\"2\" column=\"1\" severity=\"error\" message=\"sneaky, 'sneaky', &lt;sneaky&gt;, sneak &amp; sneaky\" source=\"\"/>",
                 expected = "<?xml version=\"1.0\" encoding=\"utf-8\"?><checkstyle>" + file + error1 + error2 + "</file></checkstyle>",
                 actual = CSSLint.format(result, "FILE", "checkstyle-xml");
             Assert.areEqual(expected, actual);
diff --git a/tests/formatters/csslint-xml.js b/tests/formatters/csslint-xml.js
@@ -26,14 +26,14 @@
         },
 
         "Formatter should escape double quotes": function() {
-            var doubleQuotedEvidence = 'sneaky, "sneaky"',
+            var doubleQuotedEvidence = 'sneaky, "sneaky", <sneaky>, sneak & sneaky',
                 result = { messages: [
                      { type: "warning", line: 1, col: 1, message: "BOGUS", evidence: doubleQuotedEvidence, rule: [] },
                      { type: "error", line: 2, col: 1, message: "BOGUS", evidence: doubleQuotedEvidence, rule: [] }
                 ], stats: [] },
                 file = "<file name=\"FILE\">",
-                error1 = "<issue line=\"1\" char=\"1\" severity=\"warning\" reason=\"BOGUS\" evidence=\"sneaky, 'sneaky'\"/>",
-                error2 = "<issue line=\"2\" char=\"1\" severity=\"error\" reason=\"BOGUS\" evidence=\"sneaky, 'sneaky'\"/>",
+                error1 = "<issue line=\"1\" char=\"1\" severity=\"warning\" reason=\"BOGUS\" evidence=\"sneaky, 'sneaky', &lt;sneaky&gt;, sneak &amp; sneaky\"/>",
+                error2 = "<issue line=\"2\" char=\"1\" severity=\"error\" reason=\"BOGUS\" evidence=\"sneaky, 'sneaky', &lt;sneaky&gt;, sneak &amp; sneaky\"/>",
                 expected = "<?xml version=\"1.0\" encoding=\"utf-8\"?><csslint>" + file + error1 + error2 + "</file></csslint>",
                 actual = CSSLint.format(result, "FILE", "csslint-xml");
             Assert.areEqual(expected, actual);
diff --git a/tests/formatters/lint-xml.js b/tests/formatters/lint-xml.js
@@ -27,14 +27,14 @@
         },
 
         "Formatter should escape double quotes": function() {
-            var doubleQuotedEvidence = 'sneaky, "sneaky"',
+            var doubleQuotedEvidence = 'sneaky, "sneaky", <sneaky>, sneak & sneaky',
                 result = { messages: [
                      { type: "warning", line: 1, col: 1, message: "BOGUS", evidence: doubleQuotedEvidence, rule: [] },
                      { type: "error", line: 2, col: 1, message: "BOGUS", evidence: doubleQuotedEvidence, rule: [] }
                 ], stats: [] },
                 file = "<file name=\"FILE\">",
-                error1 = "<issue line=\"1\" char=\"1\" severity=\"warning\" reason=\"BOGUS\" evidence=\"sneaky, 'sneaky'\"/>",
-                error2 = "<issue line=\"2\" char=\"1\" severity=\"error\" reason=\"BOGUS\" evidence=\"sneaky, 'sneaky'\"/>",
+                error1 = "<issue line=\"1\" char=\"1\" severity=\"warning\" reason=\"BOGUS\" evidence=\"sneaky, 'sneaky', &lt;sneaky&gt;, sneak &amp; sneaky\"/>",
+                error2 = "<issue line=\"2\" char=\"1\" severity=\"error\" reason=\"BOGUS\" evidence=\"sneaky, 'sneaky', &lt;sneaky&gt;, sneak &amp; sneaky\"/>",
                 expected = "<?xml version=\"1.0\" encoding=\"utf-8\"?><lint>" + file + error1 + error2 + "</file></lint>",
                 actual = CSSLint.format(result, "FILE", "lint-xml");
             Assert.areEqual(expected, actual);

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ CSSLint.addFormatter({`
`50`	`50`	`*`
`51`	`51`	`* Rules:`
`52`	`52`	`* - single quotes is the escape sequence for double-quotes`
	`53`	`+ * - & is the escape sequence for &`
`53`	`54`	`* - < is the escape sequence for <`
`54`	`55`	`* - > is the escape sequence for >`
`55`	`56`	`*`
`@@ -60,7 +61,7 @@ CSSLint.addFormatter({`
`60`	`61`	`if (!str \|\| str.constructor !== String) {`
`61`	`62`	`return "";`
`62`	`63`	`}`
`63`		`- return str.replace(/\"/g, "'").replace(/</g, "<").replace(/>/g, ">");`
	`64`	`+ return str.replace(/\"/g, "'").replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">");`
`64`	`65`	`};`
`65`	`66`
`66`	`67`	`if (messages.length > 0) {`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ CSSLint.addFormatter({`
`36`	`36`	`*`
`37`	`37`	`* Rules:`
`38`	`38`	`* - single quotes is the escape sequence for double-quotes`
	`39`	`+ * - & is the escape sequence for &`
`39`	`40`	`* - < is the escape sequence for <`
`40`	`41`	`* - > is the escape sequence for >`
`41`	`42`	`*`
`@@ -46,7 +47,7 @@ CSSLint.addFormatter({`
`46`	`47`	`if (!str \|\| str.constructor !== String) {`
`47`	`48`	`return "";`
`48`	`49`	`}`
`49`		`- return str.replace(/\"/g, "'").replace(/</g, "<").replace(/>/g, ">");`
	`50`	`+ return str.replace(/\"/g, "'").replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">");`
`50`	`51`	`};`
`51`	`52`
`52`	`53`	`if (messages.length > 0) {`