@angular-wave/angular.ts 0.4.4 → 0.4.5

package/src/directive/controller/controller.spec.js

@@ -69,6 +69,7 @@ describe("ngController", () => {
     element = $compile('<div ng-controller="Greeter">{{greet(name)}}</div>')(
       $rootScope,
     );
+    $rootScope.$digest();
     expect(element.text()).toBe("Hello Misko!");
   });
 
@@ -76,6 +77,7 @@ describe("ngController", () => {
     element = $compile('<div ng-controller="BoundFoo">{{mark}}</div>')(
       $rootScope,
     );
+    $rootScope.$digest();
     expect(element.text()).toBe("foo");
   });
 
@@ -83,6 +85,7 @@ describe("ngController", () => {
     element = $compile('<div ng-controller="Public as p">{{p.mark}}</div>')(
       $rootScope,
     );
+    $rootScope.$digest();
     expect(element.text()).toBe("works");
   });
 
@@ -90,6 +93,7 @@ describe("ngController", () => {
     element = $compile(
       '<div ng-controller="PublicModule as p">{{p.mark}}</div>',
     )($rootScope);
+    $rootScope.$digest();
     expect(element.text()).toBe("works");
   });
 
@@ -97,12 +101,14 @@ describe("ngController", () => {
     element = $compile(
       '<div ng-controller="Greeter"><div ng-controller="Child">{{greet(name)}}</div></div>',
     )($rootScope);
+    $rootScope.$digest();
     expect(element.text()).toBe("Hello Adam!");
     dealoc(element);
 
     element = $compile(
       '<div ng-controller="Greeter"><div ng-controller="Child">{{protoGreet(name)}}</div></div>',
     )($rootScope);
+    $rootScope.$digest();
     expect(element.text()).toBe("Hello Adam!");
   });
 
@@ -119,6 +125,7 @@ describe("ngController", () => {
     injector = angular.bootstrap(element, ["myModule"]);
 
     $rootScope = injector.get("$rootScope");
+    $rootScope.$digest();
     setTimeout(() => {
       expect(element.text()).toEqual("Vojta");
       dealoc($rootScope);
@@ -143,7 +150,11 @@ describe("ngController", () => {
     $rootScope = injector.get("$rootScope");
 
     $rootScope.expr = "first";
+    $rootScope.$digest();
+
     $rootScope.expr = "second";
+    $rootScope.$digest();
+
     expect(count).toBe(1);
   });
 
@@ -163,6 +174,8 @@ describe("ngController", () => {
     injector = angular.bootstrap(element, ["myModule"]);
 
     $rootScope = injector.get("$rootScope");
+    $rootScope.$digest();
+
     expect(controllerScope.name).toBeUndefined();
   });
 });

package/src/directive/events/click.spec.js

@@ -21,6 +21,7 @@ describe("ngClick", () => {
 
   it("should get called on a click", () => {
     element = $compile('<div ng-click="clicked = true"></div>')($rootScope);
+    $rootScope.$digest();
     expect($rootScope.clicked).toBeFalsy();
 
     element[0].click();
@@ -29,6 +30,8 @@ describe("ngClick", () => {
 
   it("should pass event object", () => {
     element = $compile('<div ng-click="event = $event"></div>')($rootScope);
+    $rootScope.$digest();
+
     element[0].click();
     expect($rootScope.event).toBeDefined();
   });

package/src/directive/events/event.spec.js

@@ -40,6 +40,8 @@ describe("event directives", () => {
           '<input type="submit" />' +
           "</form>",
       )($rootScope);
+      $rootScope.$digest();
+
       // Support: Chrome 60+
       // We need to add the form to the DOM in order for `submit` events to be properly fired.
       document.getElementById("dummy").appendChild(element[0]);
@@ -67,6 +69,8 @@ describe("event directives", () => {
           '<input type="submit" />' +
           "</form>",
       )($rootScope);
+      $rootScope.$digest();
+
       // Support: Chrome 60+ (on Windows)
       // We need to add the form to the DOM in order for `submit` events to be properly fired.
       document.getElementById("dummy").appendChild(element[0]);
@@ -272,6 +276,8 @@ describe("event directives", () => {
         logs.push("done");
       });
 
+      $rootScope.$digest();
+
       expect(logs[0]).toEqual("listener error");
       expect(logs[1]).toEqual("done");
     });

package/src/directive/form/form.js

@@ -448,8 +448,9 @@ addSetValidityMethod({
  */
 const formDirectiveFactory = function (isNgForm) {
   return [
+    "$timeout",
     "$parse",
-    function ($parse) {
+    function ($timeout, $parse) {
       const formDirective = {
         name: "form",
         restrict: isNgForm ? "EA" : "E",
@@ -491,7 +492,7 @@ const formDirectiveFactory = function (isNgForm) {
                 // unregister the preventDefault listener so that we don't not leak memory but in a
                 // way that will achieve the prevention of the default action.
                 formElement.on("$destroy", () => {
-                  setTimeout(
+                  $timeout(
                     () => {
                       formElement[0].removeEventListener(
                         "submit",

package/src/directive/form/form.spec.js

@@ -53,6 +53,8 @@ describe("form", () => {
         "</form>",
     )(scope);
     scope.inputPresent = true;
+    scope.$digest();
+
     const form = scope.myForm;
     control.$setValidity("required", false);
 
@@ -113,6 +115,8 @@ describe("form", () => {
         "</form>",
     )(scope);
 
+    scope.$digest();
+
     const form = scope.myForm;
 
     const input = doc.find("input").eq(0);
@@ -154,6 +158,8 @@ describe("form", () => {
         '<form name="otherForm"></form>',
     )(scope);
 
+    scope.$digest();
+
     const form = scope.myForm;
     const { otherForm } = scope;
     const { childControl } = form;
@@ -167,11 +173,15 @@ describe("form", () => {
 
     // rename the childControl
     scope.controlName = "childControlMoved";
+    scope.$digest();
+
     expect(form.childControlMoved).toBeUndefined();
     expect(otherForm.childControl).toBeUndefined();
     expect(otherForm.childControlMoved).toBe(childControl);
 
     scope.hasChildControl = false;
+    scope.$digest();
+
     expect(form.childControlMoved).toBeUndefined();
     expect(otherForm.childControlMoved).toBeUndefined();
   });
@@ -185,6 +195,7 @@ describe("form", () => {
         "</form></div>",
     )(scope);
 
+    scope.$digest();
     expect(scope.ctrl.myForm).toBeUndefined();
 
     scope.$apply("formPresent = true");
@@ -245,6 +256,7 @@ describe("form", () => {
         </form>
       </div>
     `)(scope);
+    scope.$digest();
     expect(scope.formA.$error.required.length).toBe(1);
     expect(scope.formA.$error.required).toEqual([scope.formA.firstName]);
     expect(scope.formB.$error.required.length).toBe(1);
@@ -298,6 +310,8 @@ describe("form", () => {
           '<input type="text" ng-model="name" />' +
           "</form>",
       )(scope);
+      scope.$digest();
+
       const inputElm = form.find("input").eq(0);
 
       inputElm[0].setAttribute("value", "a");
@@ -317,6 +331,8 @@ describe("form", () => {
           "</div>" +
           "</form>",
       )(scope);
+      scope.$digest();
+
       const inputElm = form.find("input").eq(0);
       inputElm[0].setAttribute("value", "a");
       inputElm[0].dispatchEvent(new Event("change"));
@@ -334,6 +350,8 @@ describe("form", () => {
           '<input type="text" ng-model="name" />' +
           "</form>",
       )(scope);
+      scope.$digest();
+
       const inputElm = form.find("input").eq(0);
       inputElm[0].setAttribute("value", "a");
       inputElm[0].dispatchEvent(new Event("change"));
@@ -355,6 +373,8 @@ describe("form", () => {
           '<button ng-click="test.$rollbackViewValue()" />' +
           "</form>",
       )(scope);
+      scope.$digest();
+
       const inputElm = form.find("input").eq(0);
       inputElm[0].setAttribute("value", "a");
       inputElm[0].dispatchEvent(new Event("click"));
@@ -374,6 +394,8 @@ describe("form", () => {
           '<button ng-click="test.$rollbackViewValue()" />' +
           "</form>",
       )(scope);
+      scope.$digest();
+
       const inputElm = form.find("input").eq(0);
       inputElm[0].setAttribute("value", "a");
       inputElm[0].dispatchEvent(new Event("click"));
@@ -923,6 +945,8 @@ describe("form", () => {
           '<form name="otherForm"></form>',
       )(scope);
 
+      scope.$digest();
+
       const form = scope.myForm;
       const { otherForm } = scope;
       const { childForm } = form;
@@ -936,11 +960,15 @@ describe("form", () => {
 
       // rename the childForm
       scope.formName = "childFormMoved";
+      scope.$digest();
+
       expect(form.childFormMoved).toBeUndefined();
       expect(otherForm.childForm).toBeUndefined();
       expect(otherForm.childFormMoved).toBe(childForm);
 
       scope.hasChildForm = false;
+      scope.$digest();
+
       expect(form.childFormMoved).toBeUndefined();
       expect(otherForm.childFormMoved).toBeUndefined();
     });
@@ -985,23 +1013,28 @@ describe("form", () => {
           '<input ng-model="name" name="name" store-model-ctrl/>' +
           "</form>",
       )(scope);
+
+      scope.$digest();
     });
 
     it("should have ng-valid/ng-invalid css class", () => {
       expect(doc[0].classList.contains("ng-valid")).toBeTrue();
 
       control.$setValidity("error", false);
+      scope.$digest();
       expect(doc[0].classList.contains("ng-invalid")).toBeTrue();
       expect(doc[0].classList.contains("ng-valid-error")).toBe(false);
       expect(doc[0].classList.contains("ng-invalid-error")).toBe(true);
 
       control.$setValidity("another", false);
+      scope.$digest();
       expect(doc[0].classList.contains("ng-valid-error")).toBe(false);
       expect(doc[0].classList.contains("ng-invalid-error")).toBe(true);
       expect(doc[0].classList.contains("ng-valid-another")).toBe(false);
       expect(doc[0].classList.contains("ng-invalid-another")).toBe(true);
 
       control.$setValidity("error", true);
+      scope.$digest();
       expect(doc[0].classList.contains("ng-invalid")).toBeTrue();
       expect(doc[0].classList.contains("ng-valid-error")).toBe(true);
       expect(doc[0].classList.contains("ng-invalid-error")).toBe(false);
@@ -1009,6 +1042,7 @@ describe("form", () => {
       expect(doc[0].classList.contains("ng-invalid-another")).toBe(true);
 
       control.$setValidity("another", true);
+      scope.$digest();
       expect(doc[0].classList.contains("ng-valid")).toBeTrue();
       expect(doc[0].classList.contains("ng-valid-error")).toBe(true);
       expect(doc[0].classList.contains("ng-invalid-error")).toBe(false);
@@ -1018,6 +1052,7 @@ describe("form", () => {
       // validators are skipped, e.g. because of a parser error
       control.$setValidity("error", null);
       control.$setValidity("another", null);
+      scope.$digest();
       expect(doc[0].classList.contains("ng-valid-error")).toBe(false);
       expect(doc[0].classList.contains("ng-invalid-error")).toBe(false);
       expect(doc[0].classList.contains("ng-valid-another")).toBe(false);
@@ -1038,6 +1073,7 @@ describe("form", () => {
   describe("$pending", () => {
     beforeEach(() => {
       doc = $compile('<form name="form"></form>')(scope);
+      scope.$digest();
     });
 
     it("should set valid and invalid to undefined when a validation error state is set as pending", () => {
@@ -1074,6 +1110,8 @@ describe("form", () => {
           "</form>",
       )(scope);
 
+      scope.$digest();
+
       const form = doc;
       const formCtrl = scope.testForm;
       const input1 = form.find("input").eq(0);
@@ -1089,6 +1127,8 @@ describe("form", () => {
       expect(input2[0].classList.contains("ng-dirty")).toBeTrue();
 
       formCtrl.$setPristine();
+      scope.$digest();
+
       expect(form[0].classList.contains("ng-pristine")).toBeTrue();
       expect(form[0].classList.contains("ng-dirty")).toBeFalse();
       expect(formCtrl.$pristine).toBe(true);
@@ -1107,6 +1147,8 @@ describe("form", () => {
         '<form name="testForm">' + '<input ng-model="anonymous">' + "</form>",
       )(scope);
 
+      scope.$digest();
+
       const form = doc;
       const formCtrl = scope.testForm;
       const input = form.find("input").eq(0);
@@ -1118,6 +1160,7 @@ describe("form", () => {
       expect(input[0].classList.contains("ng-dirty")).toBeTrue();
 
       formCtrl.$setPristine();
+      scope.$digest();
       expect(form[0].classList.contains("ng-pristine")).toBeTrue();
       expect(formCtrl.$pristine).toBe(true);
       expect(formCtrl.$dirty).toBe(false);
@@ -1135,6 +1178,8 @@ describe("form", () => {
           "</form>",
       )(scope);
 
+      scope.$digest();
+
       const form = doc;
       const formCtrl = scope.testForm;
       const nestedForm = form.find("div");
@@ -1149,7 +1194,10 @@ describe("form", () => {
       expect(nestedInput[0].classList.contains("ng-dirty")).toBeTrue();
 
       formCtrl.$setPristine();
+      scope.$digest();
       expect(form[0].classList.contains("ng-pristine")).toBeTrue();
+      scope.$digest();
+
       expect(formCtrl.$pristine).toBe(true);
       expect(formCtrl.$dirty).toBe(false);
       expect(nestedForm[0].classList.contains("ng-pristine")).toBeTrue();
@@ -1168,6 +1216,8 @@ describe("form", () => {
           '<input name="alias" type="text" ng-model="name" />' +
           "</form>",
       )(scope);
+      scope.$digest();
+
       scope.myForm.alias.$setTouched();
       expect(scope.myForm.alias.$touched).toBe(true);
       scope.myForm.$setUntouched();
@@ -1183,6 +1233,8 @@ describe("form", () => {
           "</div>" +
           "</form>",
       )(scope);
+      scope.$digest();
+
       scope.myForm.childForm.alias.$setTouched();
       expect(scope.myForm.childForm.alias.$touched).toBe(true);
       scope.myForm.$setUntouched();
@@ -1195,6 +1247,8 @@ describe("form", () => {
     it("should return an empty array if the controller has no controls", () => {
       doc = $compile('<form name="testForm"></form>')(scope);
 
+      scope.$digest();
+
       const formCtrl = scope.testForm;
 
       expect(formCtrl.$getControls()).toEqual([]);
@@ -1210,6 +1264,8 @@ describe("form", () => {
           "</form>",
       )(scope);
 
+      scope.$digest();
+
       const form = doc;
       const formCtrl = scope.testForm;
       const formInput = form.children("input").eq(0);
@@ -1248,6 +1304,7 @@ describe("form", () => {
         "</form>",
     )(scope);
 
+    scope.$digest();
     const formA = scope.form.nestedA;
     expect(formA).toBeDefined();
     expect(formA.$name).toBe("nestedA");
@@ -1258,6 +1315,8 @@ describe("form", () => {
 
     scope.idA = "B";
     scope.idB = "Y";
+    scope.$digest();
+
     expect(scope.form.nestedA).toBeUndefined();
     expect(scope.form.nestedB).toBe(formA);
     expect(formA.nestedX).toBeUndefined();
@@ -1268,6 +1327,7 @@ describe("form", () => {
     const element = $compile('<form name="name{{nameID}}"></form>')(scope);
     const element2 = $compile('<div ng-form="ngform{{nameID}}"></div>')(scope);
     scope.nameID = "A";
+    scope.$digest();
     const form = element.controller("form");
     const form2 = element2.controller("form");
     expect(scope.nameA).toBe(form);
@@ -1276,6 +1336,7 @@ describe("form", () => {
     expect(form2.$name).toBe("ngformA");
 
     scope.nameID = "B";
+    scope.$digest();
     expect(scope.nameA).toBeUndefined();
     expect(scope.ngformA).toBeUndefined();
     expect(scope.nameB).toBe(form);
@@ -1286,10 +1347,12 @@ describe("form", () => {
 
   it("should rename forms with an initially blank name", () => {
     const element = $compile('<form name="{{name}}"></form>')(scope);
+    scope.$digest();
     const form = element.controller("form");
     expect(scope[""]).toBe(form);
     expect(form.$name).toBe("");
     scope.name = "foo";
+    scope.$digest();
     expect(scope.foo).toBe(form);
     expect(form.$name).toBe("foo");
     expect(scope.foo).toBe(form);
@@ -1303,6 +1366,8 @@ describe("form", () => {
           '<input type="submit" />' +
           "</form>",
       )(scope);
+
+      scope.$digest();
     });
 
     it("should not init in submitted state", () => {

package/src/directive/if/if.spec.js

@@ -146,6 +146,8 @@ describe("ngIf", () => {
       });
       injector = angular.bootstrap(element, ["myModule"]);
 
+      $rootScope.$digest();
+
       setTimeout(() => {
         expect(element.text()).toBe("Hello");
         done();
@@ -210,6 +212,7 @@ describe("ngIf", () => {
 
     it("should not trigger a digest when the element is removed", () => {
       const spy = spyOn($rootScope, "$digest").and.callThrough();
+      let $timeout = injector.get("$timeout");
       $scope.hello = true;
       makeIf("hello");
       expect(element.children().length).toBe(1);
@@ -265,6 +268,7 @@ describe("ngIf", () => {
         const element = $compile('<iso><span ng-bind="val"></span></iso>')(
           $rootScope,
         );
+        $rootScope.$digest();
         expect(element.text().trim()).toEqual(
           "val=value in iso scope-transcluded content",
         );