Test fixes

Author: Anatoly Ostrovsky

@types/shared/utils.d.ts

@@ -427,10 +427,10 @@ export function fromJson(json: string): any | Array<any> | string | number;
 export function addDateMinutes(date: Date, minutes: number): Date;
 /**
  * Parses an escaped url query string into key-value pairs.
- * @param {string} keyValue
+ * @param {string} value
  * @returns {Object.<string,boolean|Array<any>>}
  */
-export function parseKeyValue(keyValue: string): {
+export function parseKeyValue(value: string): {
   [x: string]: boolean | any[];
 };
 /**

src/services/location/location.js

@@ -102,11 +102,11 @@ export class Location {
       throw $locationMinErr("badurl", 'Invalid url "{0}".', url);
     }
 
-    if (match[1] !== undefined || url === "") {
+    if (match[1] || url === "") {
       this.setPath(match[1] || "");
     }
 
-    if (match[2] !== undefined || match[1] !== undefined || url === "") {
+    if (match[2] || match[1] || url === "") {
       this.setSearch(match[3] || "");
     }
 
@@ -134,10 +134,7 @@ export class Location {
     validateRequired(path, "path");
     let newPath = path !== null ? path.toString() : "";
 
-    if (this.html5) {
-      // decode reserved characters except slashes
-      newPath = decodePath(newPath, false);
-    }
+    newPath = decodePath(newPath, this.html5);
 
     _path = newPath.charAt(0) === "/" ? newPath : `/${newPath}`;
     this._compose();

src/services/location/location.spec.js

@@ -94,7 +94,6 @@ describe("$location", () => {
         "http://www.domain.com:9877/",
         true,
       );
-      debugger;
       locationUrl.parse(
         "http://www.domain.com:9877/path/b?search=a&b=c&d#hash",
       );
@@ -285,7 +284,6 @@ describe("$location", () => {
     it("url getter/setter should change only hash when no search and path specified", () => {
       const locationUrl = createLocationHtml5Url();
       expect(locationUrl.getUrl()).toBe("/path/b?search=a&b=c&d#hash");
-
       locationUrl.setUrl("#some-hash");
 
       expect(locationUrl.getHash()).toBe("some-hash");
@@ -435,7 +433,7 @@ describe("$location", () => {
 
       it("should allow to set both URL and state", () => {
         const locationUrl = createLocationHtml5Url();
-        locationUrl.setUrl("/foo");
+        locationUrl.setUrl("/foo").setState({ a: 2 });
         expect(locationUrl.getUrl()).toEqual("/foo");
         expect(locationUrl.getState()).toEqual({ a: 2 });
       });

src/shared/utils.js

@@ -786,27 +786,29 @@ export function addDateMinutes(date, minutes) {
 
 /**
  * Parses an escaped url query string into key-value pairs.
- * @param {string} keyValue
+ * @param {string} value
  * @returns {Object.<string,boolean|Array<any>>}
  */
-export function parseKeyValue(keyValue) {
+export function parseKeyValue(value) {
   /** @type {Record<string, boolean | string | Array<any>>} */
   const obj = {};
 
-  (keyValue || "").split("&").forEach((item) => {
+  const res = value || "";
+
+  res.split("&").forEach((keyValue) => {
     let splitPoint;
 
     let key;
 
     let val;
 
-    if (item) {
-      key = keyValue = item.replace(/\+/g, "%20");
-      splitPoint = item.indexOf("=");
+    if (keyValue) {
+      key = keyValue = keyValue.replace(/\+/g, "%20");
+      splitPoint = keyValue.indexOf("=");
 
       if (splitPoint !== -1) {
-        key = item.substring(0, splitPoint);
-        val = item.substring(splitPoint + 1);
+        key = keyValue.substring(0, splitPoint);
+        val = keyValue.substring(splitPoint + 1);
       }
       key = tryDecodeURIComponent(key);