Update <a>/<area> API to match current specs

This fixes several issues: - Changing the pathname should update the href - Empty string host values should be treated like null - Setting username/password/port of a file: URL should not work - Setting the port to an empty string should remove the port - Setting the fragment of javascript: URLs should work
jsdom · Apr 24, 2017 · 3aca01a · 3aca01a
1 parent fa74ef9
commit 3aca01a
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 24 deletions.
diff --git a/lib/jsdom/living/nodes/HTMLHyperlinkElementUtils-impl.js b/lib/jsdom/living/nodes/HTMLHyperlinkElementUtils-impl.js
@@ -12,7 +12,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get href() {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null) {
@@ -28,7 +28,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get origin() {
-    setTheURL(this);
+    reinitializeURL(this);
 
     if (this.url === null) {
       return "";
@@ -38,7 +38,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get protocol() {
-    setTheURL(this);
+    reinitializeURL(this);
 
     if (this.url === null) {
       return ":";
@@ -48,6 +48,8 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set protocol(v) {
+    reinitializeURL(this);
+
     if (this.url === null) {
       return;
     }
@@ -57,7 +59,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get username() {
-    setTheURL(this);
+    reinitializeURL(this);
 
     if (this.url === null) {
       return "";
@@ -67,9 +69,10 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set username(v) {
+    reinitializeURL(this);
     const url = this.url;
 
-    if (url === null || url.host === null || url.cannotBeABaseURL) {
+    if (url === null || url.host === null || url.host === "" || url.cannotBeABaseURL || url.scheme === "file") {
       return;
     }
 
@@ -78,20 +81,21 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get password() {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
-    if (url === null || url.password === null) {
+    if (url === null) {
       return "";
     }
 
     return url.password;
   }
 
   set password(v) {
+    reinitializeURL(this);
     const url = this.url;
 
-    if (url === null || url.host === null || url.cannotBeABaseURL) {
+    if (url === null || url.host === null || url.host === "" || url.cannotBeABaseURL || url.scheme === "file") {
       return;
     }
 
@@ -100,7 +104,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get host() {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null || url.host === null) {
@@ -115,7 +119,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set host(v) {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null || url.cannotBeABaseURL) {
@@ -127,7 +131,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get hostname() {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null || url.host === null) {
@@ -138,7 +142,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set hostname(v) {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null || url.cannotBeABaseURL) {
@@ -150,7 +154,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   get port() {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null || url.port === null) {
@@ -161,19 +165,23 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set port(v) {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
-    if (url === null || url.host === null || url.cannotBeABaseURL || url.scheme === "file") {
+    if (url === null || url.host === null || url.host === "" || url.cannotBeABaseURL || url.scheme === "file") {
       return;
     }
 
-    whatwgURL.basicURLParse(v, { url, stateOverride: "port" });
+    if (v === "") {
+      url.port = null;
+    } else {
+      whatwgURL.basicURLParse(v, { url, stateOverride: "port" });
+    }
     updateHref(this);
   }
 
   get pathname() {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null) {
@@ -188,7 +196,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set pathname(v) {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null || url.cannotBeABaseURL) {
@@ -197,10 +205,11 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
 
     url.path = [];
     whatwgURL.basicURLParse(v, { url, stateOverride: "path start" });
+    updateHref(this);
   }
 
   get search() {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null || url.query === null || url.query === "") {
@@ -211,7 +220,7 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set search(v) {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null) {
@@ -223,13 +232,17 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
     } else {
       const input = v[0] === "?" ? v.substring(1) : v;
       url.query = "";
-      whatwgURL.basicURLParse(input, { url, stateOverride: "query" });
+      whatwgURL.basicURLParse(input, {
+        url,
+        stateOverride: "query",
+        encodingOverride: this._ownerDocument.charset
+      });
     }
     updateHref(this);
   }
 
   get hash() {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
     if (url === null || url.fragment === null || url.fragment === "") {
@@ -240,10 +253,10 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 
   set hash(v) {
-    setTheURL(this);
+    reinitializeURL(this);
     const url = this.url;
 
-    if (url === null || url.scheme === "javascript") {
+    if (url === null) {
       return;
     }
 
@@ -258,6 +271,14 @@ exports.implementation = class HTMLHyperlinkElementUtilsImpl {
   }
 };
 
+function reinitializeURL(hheu) {
+  if (hheu.url !== null && hheu.url.scheme === "blob" && hheu.url.cannotBeABaseURL) {
+    return;
+  }
+
+  setTheURL(hheu);
+}
+
 function setTheURL(hheu) {
   const href = hheu.getAttribute("href");
   if (href === null) {

diff --git a/test/web-platform-tests/index.js b/test/web-platform-tests/index.js
@@ -239,6 +239,8 @@ describe("Web Platform Tests", () => {
     // "dom/events/EventTarget-dispatchEvent.html", // we don't support every event interface yet
     "dom/events/EventTarget-removeEventListener.html",
 
+    "url/url-setters.html",
+
     "FileAPI/fileReader.html",
     "FileAPI/historical.html",
     // "FileAPI/idlharness.html", // idl should be used here