@angular-wave/angular.ts 0.7.8 → 0.8.1

package/src/router/directives/view-directive.spec.js

@@ -1,5 +1,5 @@
 import { createElementFromHTML, dealoc } from "../../shared/dom.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { wait } from "../../shared/test-utils.js";
 
 describe("ngView", () => {
@@ -12,7 +12,7 @@ describe("ngView", () => {
     app,
     $injector,
     $state,
-    $ngViewScroll;
+    $viewScroll;
 
   const aState = {
       name: "a",
@@ -129,8 +129,8 @@ describe("ngView", () => {
     app = window.angular
       .module("defaultModule", [])
       .config(($provide, _$stateProvider_) => {
-        $provide.decorator("$ngViewScroll", () => {
-          return jasmine.createSpy("$ngViewScroll");
+        $provide.decorator("$viewScroll", () => {
+          return jasmine.createSpy("$viewScroll");
         });
 
         _$stateProvider_
@@ -156,11 +156,11 @@ describe("ngView", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke((_$state_, $rootScope, _$compile_, _$ngViewScroll_) => {
+    $injector.invoke((_$state_, $rootScope, _$compile_, _$viewScroll_) => {
       scope = $rootScope.$new();
       $compile = _$compile_;
       $state = _$state_;
-      $ngViewScroll = _$ngViewScroll_;
+      $viewScroll = _$viewScroll_;
     });
   });
 
@@ -312,7 +312,7 @@ describe("ngView", () => {
 
       $state.transitionTo(aState);
       await wait(100);
-      expect($ngViewScroll).not.toHaveBeenCalled();
+      expect($viewScroll).not.toHaveBeenCalled();
     });
 
     it("should autoscroll when expression is missing", async () => {
@@ -324,7 +324,7 @@ describe("ngView", () => {
 
       // animateFlush($animate);
 
-      expect($ngViewScroll).toHaveBeenCalledWith(elem.querySelector("ng-view"));
+      expect($viewScroll).toHaveBeenCalledWith(elem.querySelector("ng-view"));
     });
 
     it("should autoscroll based on expression", async () => {
@@ -336,12 +336,12 @@ describe("ngView", () => {
       $state.transitionTo(aState);
       await wait(100);
 
-      expect($ngViewScroll).not.toHaveBeenCalled();
+      expect($viewScroll).not.toHaveBeenCalled();
 
       scope.doScroll = true;
       $state.transitionTo(bState);
       await wait(100);
-      expect($ngViewScroll).toHaveBeenCalledWith(elem.querySelector("ng-view"));
+      expect($viewScroll).toHaveBeenCalledWith(elem.querySelector("ng-view"));
     });
   });
 
@@ -809,7 +809,7 @@ describe("ngView named", () => {
     $injector,
     $state,
     $rootScope,
-    $ngViewScroll;
+    $viewScroll;
 
   beforeEach(() => {
     window.angular = new Angular();
@@ -831,12 +831,12 @@ describe("ngView named", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$ngViewScroll_) => {
+    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$viewScroll_) => {
       $rootScope = _$rootScope_;
       scope = $rootScope.$new();
       $compile = _$compile_;
       $state = _$state_;
-      $ngViewScroll = _$ngViewScroll_;
+      $viewScroll = _$viewScroll_;
     });
   });
 
@@ -852,7 +852,7 @@ describe("ngView named", () => {
 
   // Test for https://github.com/angular-ui/ui-router/issues/3355
   xit("should target weird nested view setups using the view's simple name", async () => {
-    const tpl = `
+    elem.innerHTML = `
       <div>
         <div ng-view="main">
           MAIN-DEFAULT-
@@ -862,7 +862,6 @@ describe("ngView named", () => {
         </div>
       </div>
     `;
-    elem.innerHTML = tpl;
     $compile(elem)($rootScope);
 
     $state.go("test");
@@ -904,7 +903,7 @@ describe("ngView transclusion", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$ngViewScroll_) => {
+    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$viewScroll_) => {
       $rootScope = _$rootScope_;
       scope = $rootScope.$new();
       $compile = _$compile_;
@@ -974,7 +973,7 @@ describe("ngView controllers or onEnter handlers", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$ngViewScroll_) => {
+    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$viewScroll_) => {
       $rootScope = _$rootScope_;
       scope = $rootScope.$new();
       $compile = _$compile_;
@@ -1833,9 +1832,9 @@ describe("angular 1.5+ style .component()", () => {
         name: "ng12-dynamic-directive",
         url: "/ng12dynamicDirective/:type",
         componentProvider: [
-          "$stateParams",
-          function ($stateParams) {
-            return $stateParams.type;
+          "$router",
+          function ($router) {
+            return $router.params.type;
           },
         ],
       });
@@ -1861,9 +1860,9 @@ describe("angular 1.5+ style .component()", () => {
         name: "dynamicComponent",
         url: "/dynamicComponent/:type",
         componentProvider: [
-          "$stateParams",
-          function ($stateParams) {
-            return $stateParams.type;
+          "$router",
+          function ($router) {
+            return $router.params.type;
           },
         ],
       });

package/src/router/{common/common.html → glob/glob.html}

@@ -6,13 +6,12 @@
 
     <link rel="shortcut icon" type="image/png" href="/images/favicon.ico" />
     <link rel="stylesheet" href="/jasmine/jasmine.css" />
-    <link rel="stylesheet" href="/public/jasmine-helper.css" />
+    <link rel="stylesheet" href="/jasmine-helper.css" />
     <script src="/jasmine/jasmine.js"></script>
     <script src="/jasmine/jasmine-html.js"></script>
     <script src="/jasmine/boot0.js"></script>
     <script src="/jasmine/boot1.js"></script>
-    <script type="module" src="/src/router/common/glob.spec.js"></script>
-    <script type="module" src="/src/router/common/queue.spec.js"></script>
+    <script type="module" src="/src/router/glob/glob.spec.js"></script>
   </head>
   <body>
     <div id="app"></div>

package/src/router/{common/common.test.js → glob/glob.test.js}

@@ -1,10 +1,11 @@
 import { test, expect } from "@playwright/test";
 
-const TEST_URL = "src/router/common/common.html";
+const TEST_URL = "src/router/glob/glob.html";
 
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/router/params/param-type.js

@@ -27,7 +27,6 @@ export class ParamType {
   /**
    * @param def  A configuration object which contains the custom type definition.  The object's
    *        properties will override the default methods and/or pattern in `ParamType`'s public interface.
-   * @returns a new ParamType object
    */
   constructor(def) {
     this.pattern = /.*/;

package/src/router/params/param.js

@@ -192,7 +192,7 @@ export class Param {
     const normalized = this.type.$normalize(value);
     if (!this.type.is(normalized)) return false;
     // The value was of the correct type, but when encoded, did not match the ParamType's regexp
-    const encoded = this.type.encode(normalized);
+    const encoded = normalized; // this.type.encode(normalized);
     return !(isString(encoded) && !this.type.pattern.exec(encoded));
   }
   toString() {

package/src/router/path/path-utils.js

@@ -89,8 +89,13 @@ export class PathUtils {
     // The param keys specified by the incoming toParams
     return toPath.map(makeInheritedParamsNode);
   }
+
   /**
    * Computes the tree changes (entering, exiting) between a fromPath and toPath.
+   * @param {PathNode[]} fromPath
+   * @param {PathNode[]} toPath
+   * @param {boolean} [reloadState]
+   * @returns {import("../transition/interface.js").TreeChanges}
    */
   static treeChanges(fromPath, toPath, reloadState) {
     const max = Math.min(fromPath.length, toPath.length);

package/src/router/router-test-hashbang.html

@@ -0,0 +1,45 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>AngularTS</title>
+    <link rel="shortcut icon" type="image/png" href="images/favicon.ico" />
+    <script type="module" src="../index.js"></script>
+    <script>
+      document.addEventListener("DOMContentLoaded", () => {
+        window.angular.module("router", []).config([
+          "$stateProvider",
+          "$locationProvider",
+          ($stateProvider, $locationProvider) => {
+            $locationProvider.html5ModeConf = {
+              enabled: false,
+            };
+            $stateProvider
+              .state({
+                name: "home",
+                url: "",
+                template: `
+                    <h1>Home</h1>
+                    <a ng-sref="page1">Page 1</a>
+                    <a ng-sref="page2">Page 2</a>
+                `,
+              })
+              .state({
+                name: "page1",
+                url: "/page1",
+                template: "<h3>Its the NG-Router hello world app!</h3>",
+              })
+              .state({
+                name: "page2",
+                url: "/page2",
+                template: "This is another template",
+              });
+          },
+        ]);
+      });
+    </script>
+  </head>
+  <body ng-app="router">
+    <ng-view></ng-view>
+  </body>
+</html>

package/src/router/{globals.js → router.js}

@@ -1,5 +1,5 @@
 import { StateParams } from "./params/state-params.js";
-import { Queue } from "./common/queue.js";
+import { Queue } from "../shared/queue.js";
 
 /** @typedef {import('../interface.ts').ServiceProvider} ServiceProvider } */
 
@@ -9,7 +9,7 @@ import { Queue } from "./common/queue.js";
  * This is where we hold the global mutable state such as current state, current
  * params, current transition, etc.
  */
-export class RouterGlobals {
+export class Router {
   constructor() {
     /**
      * Current parameter values

package/src/router/services.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../loader.js";
+import { Angular } from "../angular.js";
 import { dealoc } from "../shared/dom.js";
 
 describe("router services", () => {
@@ -11,16 +11,16 @@ describe("router services", () => {
     let module = window["angular"].module("defaultModule", []);
     module.config(
       (
-        $urlServiceProvider,
+        $urlProvider,
         $stateRegistryProvider,
-        $routerGlobalsProvider,
+        $routerProvider,
         $transitionsProvider,
         $stateProvider,
       ) => {
         providers = {
-          $urlServiceProvider,
+          $urlProvider,
           $stateRegistryProvider,
-          $routerGlobalsProvider,
+          $routerProvider,
           $transitionsProvider,
           $stateProvider,
         };
@@ -33,7 +33,7 @@ describe("router services", () => {
   });
 
   it("Should expose ng-router providers from the UIRouter instance", () => {
-    expect(providers.$urlServiceProvider).toBeDefined();
+    expect(providers.$urlProvider).toBeDefined();
     expect(providers.$stateRegistryProvider).toBeDefined();
     expect(providers.$stateRegistryProvider).toBeDefined();
     expect(providers.$transitionsProvider).toBeDefined();
@@ -41,12 +41,11 @@ describe("router services", () => {
   });
 
   it("Should expose ng-router services from the UIRouter instance", () => {
-    expect($injector.get("$urlService")).toBeDefined();
+    expect($injector.get("$url")).toBeDefined();
     expect($injector.get("$stateRegistry")).toBeDefined();
-    expect($injector.get("$routerGlobals")).toBeDefined();
+    expect($injector.get("$router")).toBeDefined();
     expect($injector.get("$transitions")).toBeDefined();
     expect($injector.get("$state")).toBeDefined();
-    expect($injector.get("$stateParams")).toBeDefined();
     expect($injector.get("$view")).toBeDefined();
     expect($injector.get("$trace")).toBeDefined();
   });

package/src/router/state/interface.ts

@@ -607,7 +607,7 @@ export interface StateDeclaration {
    *
    * An optional object which defines multiple views, or explicitly targets specific named ui-views.
    *
-   * - What is a view config
+   * - What is a view urlConfig
    * - What is a ui-view
    * - Shorthand controller/template
    * - Incompatible with ^

package/src/router/state/state-builder.js

@@ -30,7 +30,7 @@ function dataBuilder(state) {
   return state.data;
 }
 
-function getUrlBuilder($urlService, root) {
+function getUrlBuilder($url, root) {
   return function (stateObject) {
     let stateDec = stateObject.self;
     // For future states, i.e., states whose name ends with `.**`,
@@ -50,9 +50,9 @@ function getUrlBuilder($urlService, root) {
     const parsed = parseUrl(stateDec.url);
     const url = !parsed
       ? stateDec.url
-      : $urlService.compile(parsed.val, { state: stateDec });
+      : $url.compile(parsed.val, { state: stateDec });
     if (!url) return null;
-    if (!$urlService.isMatcher(url))
+    if (!$url.isMatcher(url))
       throw new Error(`Invalid url '${url}' in state '${stateObject}'`);
     return parsed && parsed.root
       ? url

package/src/router/state/state-builder.spec.js

@@ -1,5 +1,5 @@
 import { StateBuilder } from "./state-builder.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { dealoc } from "../../shared/dom.js";
 
 // TODO refactor this to url service as it is using the provider right now

package/src/router/state/state-object.js

@@ -1,6 +1,6 @@
 import { defaults, find } from "../../shared/common.js";
 import { propEq } from "../../shared/hof.js";
-import { Glob } from "../common/glob.js";
+import { Glob } from "../glob/glob.js";
 import { hasOwn, isFunction, isObject } from "../../shared/utils.js";
 
 /** @typedef {import('./interface.js').StateDeclaration} StateDeclaration */

package/src/router/state/state-registry.js

@@ -16,17 +16,17 @@ import { $injectTokens, provider } from "../../injection-tokens.js";
  *
  */
 export class StateRegistryProvider {
-  static $inject = provider([
-    $injectTokens.$urlService,
+  /* @ignore */ static $inject = provider([
+    $injectTokens.$url,
     $injectTokens.$state,
-    $injectTokens.$routerGlobals,
+    $injectTokens.$router,
     $injectTokens.$view,
   ]);
 
   /**
    * @param urlService
    * @param stateService
-   * @param {import('../globals.js').RouterGlobals} globals
+   * @param {import('../router.js').Router} globals
    * @param viewService
    */
   constructor(urlService, stateService, globals, viewService) {

package/src/router/state/state-service.js

@@ -6,14 +6,14 @@ import {
   silentRejection,
 } from "../../shared/common.js";
 import { isDefined, isObject, isString, minErr } from "../../shared/utils.js";
-import { Queue } from "../common/queue.js";
+import { Queue } from "../../shared/queue.js";
 import { makeTargetState } from "../path/path-utils.js";
 import { PathNode } from "../path/path-node.js";
 import { defaultTransOpts } from "../transition/transition-service.js";
 import { Rejection, RejectType } from "../transition/reject-factory.js";
 import { TargetState } from "./target-state.js";
 import { Param } from "../params/param.js";
-import { Glob } from "../common/glob.js";
+import { Glob } from "../glob/glob.js";
 import { ResolveContext } from "../resolve/resolve-context.js";
 import { lazyLoadState } from "../hooks/lazy-load.js";
 import { val } from "../../shared/hof.js";
@@ -30,7 +30,7 @@ export class StateProvider {
   /**
    * The latest successful state parameters
    *
-   * @deprecated This is a passthrough through to [[RouterGlobals.params]]
+   * @deprecated This is a passthrough through to [[Router.params]]
    */
   get params() {
     return this.globals.params;
@@ -38,7 +38,7 @@ export class StateProvider {
   /**
    * The current [[StateDeclaration]]
    *
-   * @deprecated This is a passthrough through to [[RouterGlobals.current]]
+   * @deprecated This is a passthrough through to [[Router.current]]
    */
   get current() {
     return this.globals.current;
@@ -46,18 +46,18 @@ export class StateProvider {
   /**
    * The current [[StateObject]] (an internal API)
    *
-   * @deprecated This is a passthrough through to [[RouterGlobals.$current]]
+   * @deprecated This is a passthrough through to [[Router.$current]]
    */
   get $current() {
     return this.globals.$current;
   }
 
-  static $inject = ["$routerGlobalsProvider", "$transitionsProvider"];
+  /* @ignore */ static $inject = ["$routerProvider", "$transitionsProvider"];
 
   // Needs access to urlService, stateRegistry
   /**
    *
-   * @param {import('../globals.js').RouterGlobals} globals
+   * @param {import('../router.js').Router} globals
    * @param {*} transitionService
    */
   constructor(globals, transitionService) {
@@ -131,9 +131,9 @@ export class StateProvider {
    * - **params** `{object}` - returns an array of state params that are ensured to
    *   be a super-set of parent's params.
    * - **views** `{object}` - returns a views object where each key is an absolute view
-   *   name (i.e. "viewName@stateName") and each value is the config object
+   *   name (i.e. "viewName@stateName") and each value is the urlConfig object
    *   (template, controller) for the view. Even when you don't use the views object
-   *   explicitly on a state config, one is still created for you internally.
+   *   explicitly on a state urlConfig, one is still created for you internally.
    *   So by decorating this builder function you have access to decorating template
    *   and controller properties.
    * - **ownParams** `{object}` - returns an array of params that belong to the state,
@@ -151,10 +151,10 @@ export class StateProvider {
    *   let result = {},
    *       views = parent(state);
    *
-   *   angular.forEach(views, function (config, name) {
+   *   angular.forEach(views, function (urlConfig, name) {
    *     let autoName = (state.name + '.' + name).replace('.', '/');
-   *     config.templateUrl = config.templateUrl || '/partials/' + autoName + '.html';
-   *     result[name] = config;
+   *     urlConfig.templateUrl = urlConfig.templateUrl || '/partials/' + autoName + '.html';
+   *     result[name] = urlConfig;
    *   });
    *   return result;
    * });
@@ -178,7 +178,7 @@ export class StateProvider {
    * @param {object} func A function that is responsible for decorating the original
    * builder function. The function receives two parameters:
    *
-   *   - `{object}` - state - The state config object.
+   *   - `{object}` - state - The state urlConfig object.
    *   - `{object}` - super - The original builder function.
    *
    * @return {object} $stateProvider - $stateProvider instance
@@ -411,7 +411,7 @@ export class StateProvider {
     const globals = this.globals;
     const latestSuccess = globals.successfulTransitions.peekTail();
     const rootPath = () => [new PathNode(this.stateRegistry.root())];
-    return latestSuccess ? latestSuccess.treeChanges().to : rootPath();
+    return latestSuccess ? latestSuccess._treeChanges.to : rootPath();
   }
   /**
    * Low-level method for transitioning to a new state.

package/src/router/state/state.spec.js

@@ -1,5 +1,5 @@
 import { dealoc } from "../../shared/dom.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { isFunction } from "../../shared/utils.js";
 import { wait } from "../../shared/test-utils.js";
 
@@ -101,8 +101,9 @@ describe("$state", () => {
       // some tests are polluting the cache
       window.angular = new Angular();
       module = window.angular.module("defaultModule", []);
-      module.config((_$stateProvider_, _$provide_) => {
+      module.config((_$stateProvider_, _$provide_, _$locationProvider_) => {
         $stateProvider = _$stateProvider_;
+        _$locationProvider_.html5ModeConf.enabled = false;
       });
       window.angular.bootstrap(document.getElementById("app"), [
         "defaultModule",
@@ -143,10 +144,10 @@ describe("$state", () => {
       dealoc(document.getElementById("app"));
       window.angular = new Angular();
       module = window.angular.module("defaultModule", []);
-      module.config((_$stateProvider_, _$provide_) => {
+      module.config((_$stateProvider_, _$provide_, _$locationProvider_) => {
         $stateProvider = _$stateProvider_;
         $provide = _$provide_;
-
+        _$locationProvider_.html5ModeConf.enabled = false;
         [A, B, C, D, DD, E, H, HH, HHH].forEach(function (state) {
           state.onEnter = callbackLogger(state, "onEnter");
           state.onExit = callbackLogger(state, "onExit");
@@ -457,7 +458,7 @@ describe("$state", () => {
         }).forEach(([k, v]) => {
           expect($stateParams[k]).toEqual(v);
         });
-        expect($location.url()).toEqual(
+        expect($location.getUrl()).toEqual(
           "/dynstate/p1/pd1?search=s1&searchDyn=sd1",
         );
       });
@@ -617,14 +618,14 @@ describe("$state", () => {
         });
 
         it("does not exit nor enter a state when only dynamic params change (triggered via url)", async () => {
-          $location.search({ search: "s1", searchDyn: "sd2" });
+          $location.setSearch({ search: "s1", searchDyn: "sd2" });
           $rootScope.$broadcast("$locationChangeSuccess");
           await wait(100);
           expect(dynlog).toBe("success;[searchDyn=sd2];");
         });
 
         it("exits and enters a state when any non-dynamic params change (triggered via url)", async () => {
-          $location.search({ search: "s2", searchDyn: "sd2" });
+          $location.setSearch({ search: "s2", searchDyn: "sd2" });
           $rootScope.$broadcast("$locationChangeSuccess");
           await wait(100);
           expect(dynlog).toBe("exit:dyn;enter:dyn;success;");
@@ -650,23 +651,23 @@ describe("$state", () => {
           });
         });
 
-        it("updates $stateParams and $location.search when only dynamic params change (triggered via url)", async () => {
-          $location.search({ search: "s1", searchDyn: "sd2" });
+        it("updates $stateParams and $location.setSearch when only dynamic params change (triggered via url)", async () => {
+          $location.setSearch({ search: "s1", searchDyn: "sd2" });
           $rootScope.$broadcast("$locationChangeSuccess");
           await wait(100);
           expect($stateParams.search).toBe("s1");
           expect($stateParams.searchDyn).toBe("sd2");
-          expect($location.search()).toEqual({
+          expect($location.getSearch()).toEqual({
             search: "s1",
             searchDyn: "sd2",
           });
         });
 
-        it("updates $stateParams and $location.search when only dynamic params change (triggered via $state transition)", async () => {
+        it("updates $stateParams and $location.setSearch when only dynamic params change (triggered via $state transition)", async () => {
           await $state.go(".", { searchDyn: "sd2" });
           expect($stateParams.search).toBe("s1");
           expect($stateParams.searchDyn).toBe("sd2");
-          expect($location.search()).toEqual({
+          expect($location.getSearch()).toEqual({
             search: "s1",
             searchDyn: "sd2",
           });
@@ -683,7 +684,7 @@ describe("$state", () => {
         //     observedParamValue = newval;
         //   });
         //   await wait(100);
-        //   $location.search({ search: "s1", searchDyn: "sd2" });
+        //   $location.setSearch({ search: "s1", searchDyn: "sd2" });
         //   $rootScope.$broadcast("$locationChangeSuccess");
 
         //   await wait(100);
@@ -806,7 +807,7 @@ describe("$state", () => {
         // this passes in isolation
         it("updates $stateParams", async () => {
           await initStateTo(RS);
-          $location.search({ term: "hello" });
+          $location.setSearch({ term: "hello" });
           $rootScope.$broadcast("$locationChangeSuccess");
           await wait(100);
           expect($stateParams.term).toEqual("hello");
@@ -814,10 +815,10 @@ describe("$state", () => {
         });
 
         it("doesn't re-enter state (triggered by url change)", async () => {
-          $location.search({ term: "hello" });
+          $location.setSearch({ term: "hello" });
           $rootScope.$broadcast("$locationChangeSuccess");
 
-          expect($location.search()).toEqual({ term: "hello" });
+          expect($location.getSearch()).toEqual({ term: "hello" });
           expect(entered).toBeFalsy();
         });
 
@@ -833,7 +834,7 @@ describe("$state", () => {
           expect($state.current).toBe(RS);
           expect(entered).toBeFalsy();
           expect(success).toBeTruthy();
-          expect($location.search()).toEqual({ term: "hello" });
+          expect($location.getSearch()).toEqual({ term: "hello" });
         });
 
         it("updates URL when (triggered by $state transition)", async () => {
@@ -841,7 +842,7 @@ describe("$state", () => {
           await $state.go(".", { term: "goodbye" });
 
           expect($stateParams.term).toEqual("goodbye");
-          expect($location.url()).toEqual("/search?term=goodbye");
+          expect($location.getUrl()).toEqual("/search?term=goodbye");
           expect(entered).toBeFalsy();
         });
       });
@@ -976,19 +977,19 @@ describe("$state", () => {
 
     it("updates the location #fragment", async () => {
       await $state.transitionTo("home.item", { id: "world", "#": "frag" });
-      expect($location.url()).toBe("/front/world#frag");
-      expect($location.hash()).toBe("frag");
+      expect($location.getUrl()).toBe("/front/world#frag");
+      expect($location.getHash()).toBe("frag");
     });
 
     // passes in isolation. on success callback being polluted
     it("runs a transition when the location #fragment is updated", async () => {
       $state.transitionTo("home.item", { id: "world", "#": "frag" });
       await wait(100);
-      expect($location.hash()).toBe("frag");
+      expect($location.getHash()).toBe("frag");
 
       $state.transitionTo("home.item", { id: "world", "#": "blarg" });
       await wait(100);
-      expect($location.hash()).toBe("blarg");
+      expect($location.getHash()).toBe("blarg");
     });
 
     it("injects $transition$ into resolves", async () => {