Bug 1363553 - Do not decode url before parsing query string r?honza draft
authorRicky Chien <ricky060709@gmail.com>
Thu, 18 May 2017 23:04:35 +0800
changeset 580875 dc25017cab5a62a93ac66b2524ce60484b16a051
parent 580850 183c3537157290d7ccef475651b6bc35db914924
child 629413 bca9918678b721d5ed615dedc03aa1ef869d29a9
push id59692
push userbmo:rchien@mozilla.com
push dateFri, 19 May 2017 02:52:45 +0000
reviewershonza
bugs1363553
milestone55.0a1
Bug 1363553 - Do not decode url before parsing query string r?honza MozReview-Commit-ID: 6GZjI8UybuA
devtools/client/netmonitor/src/utils/request-utils.js
devtools/client/netmonitor/test/head.js
--- a/devtools/client/netmonitor/src/utils/request-utils.js
+++ b/devtools/client/netmonitor/src/utils/request-utils.js
@@ -138,17 +138,17 @@ function getUrlBaseName(url) {
 
 /**
  * Helpers for getting the query portion of a url.
  *
  * @param {string} url - url string
  * @return {string} unicode query of a url
  */
 function getUrlQuery(url) {
-  return decodeUnicodeUrl((new URL(url)).search.replace(/^\?/, ""));
+  return (new URL(url)).search.replace(/^\?/, "");
 }
 
 /**
  * Helpers for getting unicode name and query portions of a url.
  *
  * @param {string} url - url string
  * @return {string} unicode basename and query portions of a url
  */
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -411,17 +411,18 @@ function verifyRequestItemTarget(documen
   if (fuzzyUrl) {
     ok(target.querySelector(".requests-list-file").textContent.startsWith(
       name + (query ? "?" + query : "")), "The displayed file is correct.");
     ok(target.querySelector(".requests-list-file").getAttribute("title")
                                                   .startsWith(unicodeUrl),
       "The tooltip file is correct.");
   } else {
     is(target.querySelector(".requests-list-file").textContent,
-      name + (query ? "?" + query : ""), "The displayed file is correct.");
+      decodeURIComponent(name + (query ? "?" + query : "")),
+      "The displayed file is correct.");
     is(target.querySelector(".requests-list-file").getAttribute("title"),
       unicodeUrl, "The tooltip file is correct.");
   }
 
   is(target.querySelector(".requests-list-protocol").textContent,
     httpVersion, "The displayed protocol is correct.");
 
   is(target.querySelector(".requests-list-protocol").getAttribute("title"),