Test fixes

Author: Anatoly Ostrovsky

@types/core/sanitize/sanitize-uri.d.ts

@@ -35,6 +35,6 @@ export class SanitizeUriProvider implements ServiceProvider {
   /**
    * @returns {import("./interface").SanitizerFn}
    */
-  $get(): any;
+  $get: (string | (($window: ng.WindowService) => any))[];
 }
 export type ServiceProvider = import("../../interface.ts").ServiceProvider;

src/animations/animate.spec.js

@@ -1,6 +1,6 @@
 import { createElementFromHTML, dealoc } from "../shared/dom.js";
 import { Angular } from "../angular.js";
-import { isObject, mergeClasses } from "../shared/utils.js";
+import { isObject } from "../shared/utils.js";
 import { isFunction, wait } from "../shared/utils.js";
 import { createInjector } from "../core/di/injector.js";
 
@@ -496,8 +496,4 @@ describe("$animate", () => {
       });
     });
   });
-
-  describe("mergeClasses", () => {
-    expect(mergeClasses);
-  });
 });

src/core/sanitize/sanitize-uri.js

@@ -1,5 +1,4 @@
 import { isDefined } from "../../shared/utils.js";
-import { urlResolve } from "../../shared/url-utils/url-utils.js";
 
 /** @typedef {import('../../interface.ts').ServiceProvider} ServiceProvider */
 
@@ -55,21 +54,27 @@ export class SanitizeUriProvider {
   /**
    * @returns {import("./interface").SanitizerFn}
    */
-  $get() {
-    return (uri, isMediaUrl) => {
-      if (!uri) return uri;
+  $get = [
+    "$window",
+    /** @param {ng.WindowService} $window */
+    ($window) => {
+      return /** @type {import("./interface").SanitizerFn} */ (
+        (uri, isMediaUrl) => {
+          if (!uri) return uri;
 
-      /** @type {RegExp} */
-      const regex = isMediaUrl
-        ? this._imgSrcSanitizationTrustedUrlList
-        : this._aHrefSanitizationTrustedUrlList;
+          /** @type {RegExp} */
+          const regex = isMediaUrl
+            ? this._imgSrcSanitizationTrustedUrlList
+            : this._aHrefSanitizationTrustedUrlList;
 
-      const normalizedVal = urlResolve(uri.trim()).href;
+          const normalizedVal = new URL(uri.trim(), $window.location.href).href;
 
-      if (normalizedVal !== "" && !normalizedVal.match(regex)) {
-        return `unsafe:${normalizedVal}`;
-      }
-      return uri;
-    };
-  }
+          if (normalizedVal !== "" && !normalizedVal.match(regex)) {
+            return `unsafe:${normalizedVal}`;
+          }
+          return uri;
+        }
+      );
+    },
+  ];
 }

src/core/sanitize/sanitize-uri.spec.js

@@ -8,7 +8,7 @@ describe("sanitizeUri", () => {
   let $$sanitizeUri;
   beforeEach(() => {
     sanitizeUriProvider = new SanitizeUriProvider();
-    $$sanitizeUri = sanitizeUriProvider.$get();
+    $$sanitizeUri = sanitizeUriProvider.$get[1](window);
 
     sanitizeHref = function (uri) {
       return $$sanitizeUri(uri, false);

src/core/scope/scope.spec.js

@@ -107,7 +107,7 @@ describe("Scope", () => {
   });
 
   describe("$nonscope", () => {
-    it("should ignore objects with $nonscope propercoty", () => {
+    it("should ignore objects with $nonscope property", () => {
       const res = createScope({ $nonscope: true });
       expect(res.$id).toBeUndefined();
     });
@@ -592,7 +592,7 @@ describe("Scope", () => {
       expect(scope.counter).toBe(4);
     });
 
-    it("calls only the listeners registerred at the moment the watched value changes", async () => {
+    it("calls only the listeners registered at the moment the watched value changes", async () => {
       scope.someValue = "a";
       scope.counter = 0;
 
@@ -823,7 +823,7 @@ describe("Scope", () => {
         expect(scope.$$watchersCount).toEqual(scope.$handler.watchers.size);
       });
 
-      it("should fire upon $watch registration on initial registeration", async () => {
+      it("should fire upon $watch registration on initial registration", async () => {
         logs = "";
         scope.a = 1;
         scope.$watch("a", () => {

src/router/state/state.spec.js

@@ -118,7 +118,7 @@ describe("$state", () => {
       expect($stateProvider).toBeDefined();
     });
 
-    it("should should not allow states that are already registerred", () => {
+    it("should should not allow states that are already registered", () => {
       expect(() => {
         $stateProvider.state({ name: "toString", url: "/to-string" });
       }).not.toThrow();