Fix cases involving ><meta>

domenic · domenic · commit 0c03ceb824db · 2020-01-05T12:10:25.000-05:00
See jsdom/jsdom#2766.
diff --git a/lib/html-encoding-sniffer.js b/lib/html-encoding-sniffer.js
@@ -132,7 +132,6 @@ function getAttribute(buffer, i, l) {
     }
     // ">"
     if (c === 0x3E) {
-      i++;
       break;
     }
     let name = "";
diff --git a/test/no-bom-charset-bracket.html b/test/no-bom-charset-bracket.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+    <head><meta charset="utf-8">
+    </head>
+    <body></body>
+</html>
diff --git a/test/tests.js b/test/tests.js
@@ -177,6 +177,34 @@ describe("A file with no BOM and a <meta http-equiv> with no quotes", () => {
   });
 });
 
+describe("A file with no BOM and a ><meta charset>", () => {
+  const buffer = read("no-bom-charset-bracket.html");
+
+  it("should sniff as the charset value, given no options", () => {
+    const sniffedEncoding = htmlEncodingSniffer(buffer);
+
+    assert.strictEqual(sniffedEncoding, "UTF-8");
+  });
+
+  it("should sniff as the transport layer encoding, given that", () => {
+    const sniffedEncoding = htmlEncodingSniffer(buffer, {
+      transportLayerEncodingLabel: "windows-1251",
+      defaultEncoding: "ISO-8859-16"
+    });
+
+    assert.strictEqual(sniffedEncoding, "windows-1251");
+  });
+
+
+  it("should sniff as the charset value, given only a default encoding", () => {
+    const sniffedEncoding = htmlEncodingSniffer(buffer, {
+      defaultEncoding: "ISO-8859-16"
+    });
+
+    assert.strictEqual(sniffedEncoding, "UTF-8");
+  });
+});
+
 for (const utf16Encoding of ["utf-16be", "utf-16", "utf-16le"]) {
   describe(`A file with a BOM and a <meta charset> of ${utf16Encoding}`, () => {
     const buffer = read(`no-bom-charset-${utf16Encoding}.html`);

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,6 @@ function getAttribute(buffer, i, l) {`
`132`	`132`	`}`
`133`	`133`	`// ">"`
`134`	`134`	`if (c === 0x3E) {`
`135`		`- i++;`
`136`	`135`	`break;`
`137`	`136`	`}`
`138`	`137`	`let name = "";`