Test fix

Author: tolyo

@types/router/template-factory.d.ts

@@ -14,11 +14,11 @@ export class TemplateFactoryProvider {
     | ((
         $http: ng.HttpService,
         $templateCache: ng.TemplateCacheService,
-        $templateRequest: any,
+        $templateRequest: ng.TemplateRequestService,
         $injector: import("../core/di/internal-injector.js").InjectorService,
       ) => this)
   )[];
-  $templateRequest: any;
+  $templateRequest: import("../services/template-request/interface.ts").TemplateRequestService;
   $http: import("../services/http/interface.ts").HttpService;
   $templateCache: ng.TemplateCacheService;
   $injector: import("../core/di/internal-injector.js").InjectorService;
@@ -62,10 +62,9 @@ export class TemplateFactoryProvider {
    * @param {string|Function} url url of the template to load, or a function
    * that returns a url.
    * @param {Object} params Parameters to pass to the url function.
-   * @return {string|Promise.<string>} The template html as a string, or a promise
-   * for that string.
+   * @return {Promise<string>}
    */
-  fromUrl(url: string | Function, params: any): string | Promise<string>;
+  fromUrl(url: string | Function, params: any): Promise<string>;
   /**
    * Creates a template by invoking an injectable provider function.
    *

@types/services/template-request/template-request.d.ts

@@ -8,7 +8,6 @@
 export class TemplateRequestProvider {
   /** @type {ng.RequestShortcutConfig|undefined} */
   httpOptions: ng.RequestShortcutConfig | undefined;
-  /** @returns {Array} DI tokens for Angular.ts injection */
   $get: (
     | string
     | ((

src/core/compile/compile.test.js

@@ -5,7 +5,7 @@ const TEST_URL = "src/core/compile/compile.html?random=false";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
-  await page.waitForTimeout(4000);
+  await page.waitForTimeout(5000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     / 0 failures/,
   );

src/router/template-factory.js

@@ -35,7 +35,7 @@ export class TemplateFactoryProvider {
     /**
      * @param {ng.HttpService} $http
      * @param {ng.TemplateCacheService} $templateCache
-     * @param {any} $templateRequest
+     * @param {ng.TemplateRequestService} $templateRequest
      * @param {import("../core/di/internal-injector.js").InjectorService} $injector
      * @returns
      */
@@ -135,8 +135,7 @@ export class TemplateFactoryProvider {
    * @param {string|Function} url url of the template to load, or a function
    * that returns a url.
    * @param {Object} params Parameters to pass to the url function.
-   * @return {string|Promise.<string>} The template html as a string, or a promise
-   * for that string.
+   * @return {Promise<string>}
    */
   fromUrl(url, params) {
     if (isFunction(url)) url = /** @type {Function} */ (url)(params);
@@ -154,7 +153,7 @@ export class TemplateFactoryProvider {
         });
     }
 
-    return this.$templateRequest(url);
+    return this.$templateRequest(/** @type {string} */ (url));
   }
 
   /**

src/router/template-factory.spec.js

@@ -38,7 +38,7 @@ describe("templateFactory", () => {
 
   describe("template URL behavior", () => {
     it("fetches relative URLs correctly", async () => {
-      const res = $templateFactory.fromUrl("/mock/hello");
+      const res = await $templateFactory.fromUrl("/mock/hello");
       await wait(100);
       expect(await res).toEqual("Hello");
     });
@@ -86,13 +86,9 @@ describe("templateFactory", () => {
       });
     });
 
-    it("does not restrict URL loading", function () {
-      expect(() => {
-        $templateFactory.fromUrl("http://evil.com/views/view.html");
-      }).not.toThrowError();
-
-      expect(() => {
-        $templateFactory.fromUrl("data:text/html,foo");
+    it("does not restrict URL loading", async () => {
+      expect(async () => {
+        await $templateFactory.fromUrl("data:text/html,foo");
       }).not.toThrowError();
     });
   });
@@ -142,14 +138,14 @@ describe("templateFactory", () => {
         component: "dataComponent",
       });
       $stateService.go("cmp");
-      await wait();
+      await wait(100);
       expect(el.innerHTML).toMatch(/\<x-data-component/);
     });
 
     it("should prefix the components dom element with x- for components named xFoo", async () => {
       $stateRegistry.register({ name: "cmp", component: "xComponent" });
       $stateService.go("cmp");
-      await wait();
+      await wait(100);
       expect(el.innerHTML).toMatch(/\<x-x-component/);
     });
   });

src/services/template-request/template-request.js

@@ -13,7 +13,6 @@ export class TemplateRequestProvider {
   /** @type {ng.RequestShortcutConfig|undefined} */
   httpOptions;
 
-  /** @returns {Array} DI tokens for Angular.ts injection */
   $get = [
     $injectTokens._templateCache,
     $injectTokens._http,
@@ -56,7 +55,9 @@ export class TemplateRequestProvider {
 
             return response.data;
           },
-          (resp) => Promise.reject(resp),
+          (resp) => {
+            return Promise.reject(resp);
+          },
         );
       };