@angular-wave/angular.ts 0.4.4 → 0.4.5

package/src/directive/include/include.spec.js

@@ -41,6 +41,7 @@ describe("ngInclude", () => {
       );
       const injector = angular.bootstrap(element);
       $rootScope = injector.get("$rootScope");
+      $rootScope.$digest();
       setTimeout(() => {
         expect(element.text()).toEqual("hello");
         dealoc($rootScope);
@@ -56,6 +57,7 @@ describe("ngInclude", () => {
       $rootScope.fooUrl = $sce.trustAsResourceUrl(
         "http://localhost:4000/mock/hello",
       );
+      $rootScope.$digest();
       await wait(100);
       expect(element.text()).toEqual("Hello");
       dealoc($rootScope);
@@ -71,6 +73,7 @@ describe("ngInclude", () => {
       $templateCache.set("myUrl", [200, "{{name}}", {}]);
       $rootScope.name = "misko";
       $rootScope.url = "myUrl";
+      $rootScope.$digest();
       expect(body.text()).toEqual("misko");
       body.empty();
       dealoc($rootScope);
@@ -82,6 +85,8 @@ describe("ngInclude", () => {
       $rootScope = injector.get("$rootScope");
       $rootScope.expr = "Alibaba";
       $rootScope.url = "/mock/interpolation";
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect(element.text()).toEqual("Alibaba");
         done();
@@ -93,7 +98,9 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "http://example.com/myUrl";
-      expect(() => {}).toThrowError(/insecurl/);
+      expect(() => {
+        $rootScope.$digest();
+      }).toThrowError(/insecurl/);
     });
 
     it("should NOT use mistyped expressions ", () => {
@@ -103,7 +110,9 @@ describe("ngInclude", () => {
       $rootScope.name = "chirayu";
       let $sce = injector.get("$sce");
       $rootScope.url = $sce.trustAsUrl("http://example.com/myUrl");
-      expect(() => {}).toThrowError(/insecurl/);
+      expect(() => {
+        $rootScope.$digest();
+      }).toThrowError(/insecurl/);
     });
 
     it("should remove previously included text if a falsy value is bound to src", (done) => {
@@ -112,9 +121,11 @@ describe("ngInclude", () => {
       $rootScope = injector.get("$rootScope");
       $rootScope.expr = "igor";
       $rootScope.url = "/mock/interpolation";
+      $rootScope.$digest();
       setTimeout(() => {
         expect(element.text()).toEqual("igor");
         $rootScope.url = undefined;
+        $rootScope.$digest();
       }, 100);
       setTimeout(() => {
         expect(element.text()).toEqual("");
@@ -137,6 +148,8 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "/mock/interpolation";
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect(called).toBe(true);
         done();
@@ -158,6 +171,8 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "/mock/interpolation";
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect(called).toBe(true);
         done();
@@ -180,6 +195,8 @@ describe("ngInclude", () => {
 
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect(contentLoadedSpy).not.toHaveBeenCalled();
         expect(contentErrorSpy).toHaveBeenCalled();
@@ -195,8 +212,12 @@ describe("ngInclude", () => {
       );
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
+      $rootScope.$digest();
+
       expect($rootScope.loaded).not.toBeDefined();
       $rootScope.url = "/mock/hello";
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect(element.text()).toEqual("Hello");
         expect($rootScope.loaded).toBe(true);
@@ -210,14 +231,18 @@ describe("ngInclude", () => {
       element = JQLite('<div><ng-include src="url"></ng-include></div>');
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
+      $rootScope.$digest();
       expect($rootScope.$$childHead).toBeFalsy();
 
       $rootScope.url = "/mock/hello";
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect($rootScope.$$childHead.$parent).toBe($rootScope);
         expect(element.text()).toBe("Hello");
 
         $rootScope.url = "/mock/401";
+        $rootScope.$digest();
       }, 100);
 
       setTimeout(() => {
@@ -225,12 +250,14 @@ describe("ngInclude", () => {
         expect(element.text()).toBe("");
 
         $rootScope.url = "/mock/hello";
+        $rootScope.$digest();
       }, 200);
 
       setTimeout(() => {
         expect($rootScope.$$childHead.$parent).toBe($rootScope);
 
         $rootScope.url = null;
+        $rootScope.$digest();
       }, 300);
 
       setTimeout(() => {
@@ -245,13 +272,16 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "/mock/hello";
+      $rootScope.$digest();
       await wait(100);
 
       expect(element.text()).toEqual("Hello");
       $rootScope.url = null;
+      $rootScope.$digest();
       await wait(100);
       expect(element.text()).toEqual("");
       $rootScope.url = "/mock/hello";
+      $rootScope.$digest();
       // No request being made
       expect(element.text()).toEqual("Hello");
     });
@@ -262,6 +292,7 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.url = "/mock/401";
+      $rootScope.$digest();
       expect(element.text()).toBe("");
     });
 
@@ -279,6 +310,7 @@ describe("ngInclude", () => {
         called++;
       });
 
+      $rootScope.$digest();
       setTimeout(() => {
         expect(element.text()).toBe("Hello");
         done();
@@ -293,8 +325,10 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.templateUrl = "/mock/hello";
+      $rootScope.$digest();
       $rootScope.expr = "test";
       $rootScope.templateUrl = "/mock/interpolation";
+      $rootScope.$digest();
       expect(element.text()).toBe("");
 
       setTimeout(() => {
@@ -312,15 +346,21 @@ describe("ngInclude", () => {
       $rootScope = injector.get("$rootScope");
       $rootScope.hrefUrl = "fooUrl1";
       $rootScope.includeUrl = "/mock/hello";
+      $rootScope.$digest();
+
       await wait(100);
       expect(element.text()).toBe("Hello");
       expect(element.find("span").attr("foo")).toBe("#/fooUrl1");
 
       $rootScope.hrefUrl = "fooUrl2";
+      $rootScope.$digest();
+
       expect(element.text()).toBe("Hello");
       expect(element.find("span").attr("foo")).toBe("#/fooUrl2");
 
       $rootScope.includeUrl = "/mock/hello2";
+      $rootScope.$digest();
+
       await wait(100);
       expect(element.text()).toBe("Hello2");
       expect(element.find("span").attr("foo")).toBe("#/fooUrl2");
@@ -338,6 +378,7 @@ describe("ngInclude", () => {
       element = JQLite("<svg><test></test></svg>");
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
+      $rootScope.$digest();
       await wait(100);
       const child = element.find("rect");
       expect(child.length).toBe(2);
@@ -356,6 +397,7 @@ describe("ngInclude", () => {
       element = JQLite("<svg><test></test></svg>");
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
+      $rootScope.$digest();
       await wait(200);
       expect(element.find("a").length).toBe(0);
     });
@@ -368,7 +410,10 @@ describe("ngInclude", () => {
       const injector = angular.bootstrap(element, ["myModule"]);
       $rootScope = injector.get("$rootScope");
       $rootScope.show = true;
+      $rootScope.$digest();
       $rootScope.show = false;
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect(element.text()).toBe("");
         done();
@@ -383,6 +428,8 @@ describe("ngInclude", () => {
       const spy = spyOn($rootScope, "$digest").and.callThrough();
 
       $rootScope.url = "/mock/hello";
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect(element.text()).toEqual("Hello");
         $rootScope.$apply('url = "/mock/hello2"');
@@ -444,6 +491,8 @@ describe("ngInclude", () => {
           $rootScope.value = true;
         });
 
+        $rootScope.$digest();
+
         setTimeout(() => {
           expect(autoScrollSpy).toHaveBeenCalled();
           done();
@@ -465,6 +514,8 @@ describe("ngInclude", () => {
         $rootScope.$apply(() => {
           $rootScope.tpl = "/mock/hello";
         });
+        $rootScope.$digest();
+
         setTimeout(() => {
           expect(autoScrollSpy).not.toHaveBeenCalled();
           done();
@@ -517,7 +568,7 @@ describe("ngInclude", () => {
       //     expect($animate.queue.shift().event).toBe("enter");
 
       //     $animate.flush();
-      //     ;
+      //     $rootScope.$digest();
 
       //     expect(autoScrollSpy).toHaveBeenCalled();
       //   },
@@ -663,7 +714,7 @@ describe("ngInclude", () => {
     //     element = $compile(
     //       html("<div><div " + 'ng-include="tpl">' + "</div></div>"),
     //     )($rootScope);
-    //     ;
+    //     $rootScope.$digest();
 
     //     const animation = $animate.queue.pop();
     //     expect(animation.event).toBe("enter");
@@ -677,14 +728,14 @@ describe("ngInclude", () => {
     //     element = $compile(
     //       html("<div><div " + 'ng-include="tpl">' + "</div></div>"),
     //     )($rootScope);
-    //     ;
+    //     $rootScope.$digest();
 
     //     let animation = $animate.queue.shift();
     //     expect(animation.event).toBe("enter");
     //     expect(animation.element.text()).toBe("data");
 
     //     $rootScope.tpl = "";
-    //     ;
+    //     $rootScope.$digest();
 
     //     animation = $animate.queue.shift();
     //     expect(animation.event).toBe("leave");
@@ -699,13 +750,13 @@ describe("ngInclude", () => {
     //     element = $compile(
     //       html("<div><div " + 'ng-include="tpl">' + "</div></div>"),
     //     )($rootScope);
-    //     ;
+    //     $rootScope.$digest();
 
     //     const item1 = $animate.queue.shift().element;
     //     expect(item1.text()).toBe("one");
 
     //     $rootScope.tpl = "two";
-    //     ;
+    //     $rootScope.$digest();
 
     //     const itemA = $animate.queue.shift().element;
     //     const itemB = $animate.queue.shift().element;

package/src/directive/init/init.js

@@ -6,12 +6,8 @@ export function ngInitDirective() {
     priority: 450,
     compile() {
       return {
-        pre(scope, element, attrs) {
-          if (element.controller()) {
-            element.controller().$eval(attrs.ngInit);
-          } else {
-            scope.$eval(attrs.ngInit);
-          }
+        pre(scope, _element, attrs) {
+          scope.$eval(attrs.ngInit);
         },
       };
     },

package/src/directive/init/init.spec.js

@@ -39,6 +39,7 @@ describe("ngInit", () => {
     });
     injector = angular.bootstrap(element, ["myModule"]);
     $rootScope = injector.get("$rootScope");
+    $rootScope.$digest();
     expect($rootScope.template).toEqual("template2.tpl");
     setTimeout(() => {
       expect(element.find("span").text()).toEqual("2");
@@ -58,6 +59,7 @@ describe("ngInit", () => {
         '<div><div ng-controller="TestCtrl" ' +
           'ng-init="test=123"></div></div>',
       )($rootScope);
+      $rootScope.$digest();
       expect($rootScope.test).toBeUndefined();
       expect($rootScope.$$childHead.test).toEqual(123);
     });