@angular-wave/angular.ts 0.0.27 → 0.0.29

package/test/router/state.spec.js

@@ -104,7 +104,7 @@ describe("$state", () => {
       jqLite.CACHE.clear(); // some tests are polluting the cache
       window.angular = new Angular();
       publishExternalAPI();
-      module = window.angular.module("defaultModule", ["ui.router"]);
+      module = window.angular.module("defaultModule", ["ng.router"]);
       module.config((_$stateProvider_, _$provide_) => {
         $stateProvider = _$stateProvider_;
       });
@@ -153,7 +153,7 @@ describe("$state", () => {
       dealoc(document.getElementById("dummy"));
       window.angular = new Angular();
       publishExternalAPI();
-      module = window.angular.module("defaultModule", ["ui.router"]);
+      module = window.angular.module("defaultModule", ["ng.router"]);
       module.config((_$stateProvider_, _$provide_) => {
         $stateProvider = _$stateProvider_;
         $provide = _$provide_;
@@ -278,7 +278,7 @@ describe("$state", () => {
           .state({
             name: "logA",
             url: "/logA",
-            template: "<div> <div ui-view/></div>",
+            template: "<div> <div ng-view/></div>",
             controller: function () {
               log += "logA;";
             },
@@ -288,7 +288,7 @@ describe("$state", () => {
             url: "/logB",
             views: {
               $default: {
-                template: "<div> <div ui-view/></div>",
+                template: "<div> <div ng-view/></div>",
                 controller: function () {
                   log += "logB;";
                 },
@@ -300,7 +300,7 @@ describe("$state", () => {
             url: "/logC",
             views: {
               $default: {
-                template: "<div> <div ui-view/></div>",
+                template: "<div> <div ng-view/></div>",
                 controller: function () {
                   log += "logC;";
                 },
@@ -376,6 +376,7 @@ describe("$state", () => {
       let dynamicstate, childWithParam, childNoParam;
 
       beforeEach(async () => {
+        window.location.hash = "";
         dynlog = paramsChangedLog = "";
         dynamicstate = {
           name: "dyn",
@@ -384,7 +385,7 @@ describe("$state", () => {
             pathDyn: { dynamic: true },
             searchDyn: { dynamic: true },
           },
-          template: "dyn state. <div ui-view></div>",
+          template: "dyn state. <div ng-view></div>",
           controller: function () {
             this.uiOnParamsChanged = function (updatedParams) {
               const paramNames = Object.keys(updatedParams).sort();
@@ -438,16 +439,20 @@ describe("$state", () => {
         $stateProvider.state(childNoParam);
 
         $transitions.onEnter({}, function (trans, state) {
+          console.log("enter");
           dynlog += "enter:" + state.name + ";";
         });
         $transitions.onExit({}, function (trans, state) {
+          console.log("exit");
           dynlog += "exit:" + state.name + ";";
         });
         $transitions.onSuccess({}, function () {
+          console.log("success");
           dynlog += "success;";
         });
 
-        $compile("<div><ui-view></ui-view></div>")($rootScope.$new());
+        $compile("<div><ng-view></ng-view></div>")($rootScope.$new());
+        await wait(100);
         await initStateTo(dynamicstate, {
           path: "p1",
           pathDyn: "pd1",
@@ -519,7 +524,7 @@ describe("$state", () => {
         });
 
         it("resolves the $state.go() promise with the original/final state, when fully dynamic", async () => {
-          initStateTo(dynamicstate, {
+          await initStateTo(dynamicstate, {
             path: "p1",
             pathDyn: "pd1",
             search: "s1",
@@ -828,8 +833,6 @@ describe("$state", () => {
         it("doesn't re-enter state (triggered by $state transition)", async () => {
           await initStateTo(RS);
           const promise = $state.go(".", { term: "hello" });
-          await promise;
-          await wait(100);
           let success = false,
             transition = promise.transition;
           await transition.promise.then(async () => {
@@ -892,8 +895,8 @@ describe("$state", () => {
       expect(superseded.$$state.status).toBeTruthy();
     });
 
-    xit("aborts pending transitions when aborted from callbacks", () => {
-      $state.transitionTo("home.redirect");
+    xit("aborts pending transitions when aborted from callbacks", async () => {
+      await $state.transitionTo("home.redirect");
       expect($state.current.name).toBe("about");
     });
 
@@ -981,7 +984,6 @@ describe("$state", () => {
 
     it("updates the location #fragment", async () => {
       await $state.transitionTo("home.item", { id: "world", "#": "frag" });
-      await wait(100);
       expect($location.url()).toBe("/front/world#frag");
       expect($location.hash()).toBe("frag");
     });

package/test/router/template-factory.spec.js

@@ -10,7 +10,7 @@ describe("templateFactory", () => {
     dealoc(document.getElementById("dummy"));
     window.angular = new Angular();
     publishExternalAPI();
-    window.angular.module("defaultModule", ["ui.router"]);
+    window.angular.module("defaultModule", ["ng.router"]);
     $injector = window.angular.bootstrap(document.getElementById("dummy"), [
       "defaultModule",
     ]);
@@ -58,7 +58,7 @@ describe("templateFactory", () => {
   describe("templateFactory with forced use of $http service", () => {
     beforeEach(() => {
       dealoc(document.getElementById("dummy"));
-      let module = window.angular.module("defaultModule", ["ui.router"]);
+      let module = window.angular.module("defaultModule", ["ng.router"]);
       module.config(function ($templateFactoryProvider) {
         $templateFactoryProvider.useHttpService(true);
       });
@@ -91,7 +91,7 @@ describe("templateFactory", () => {
 
     beforeEach(() => {
       dealoc(document.getElementById("dummy"));
-      const mod = angular.module("defaultModule", ["ui.router"]);
+      const mod = angular.module("defaultModule", ["ng.router"]);
       mod.component("myComponent", { template: "hi" });
       mod.component("dataComponent", { template: "hi" });
       mod.component("xComponent", { template: "hi" });
@@ -115,7 +115,7 @@ describe("templateFactory", () => {
           $compile = _$compile_;
         },
       );
-      el = $compile(jqLite("<div><ui-view></ui-view></div>"))($scope.$new());
+      el = $compile(jqLite("<div><ng-view></ng-view></div>"))($scope.$new());
     });
 
     it("should not prefix the components dom element with anything", async () => {

package/test/router/url-matcher-factory.spec.js

@@ -14,7 +14,7 @@ describe("UrlMatcher", () => {
     dealoc(document.getElementById("dummy"));
     window.angular = new Angular();
     publishExternalAPI();
-    window.angular.module("defaultModule", ["ui.router"]);
+    window.angular.module("defaultModule", ["ng.router"]);
     $injector = window.angular.bootstrap(document.getElementById("dummy"), [
       "defaultModule",
     ]);
@@ -716,7 +716,7 @@ describe("UrlMatcher", () => {
 //   describe(".type()", ( ) => {
 //     let $umf;
 //     beforeEach(
-//       module("ui.router.util", function ($urlMatcherFactoryProvider) {
+//       module("ng.router.util", function ($urlMatcherFactoryProvider) {
 //         $umf = $urlMatcherFactoryProvider;
 //         $urlMatcherFactoryProvider.type("myType", {}, ( ) => {
 //           return {