@angular-wave/angular.ts 0.4.2 → 0.4.4

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

@@ -53,8 +53,6 @@ describe("form", () => {
         "</form>",
     )(scope);
     scope.inputPresent = true;
-    scope.$digest();
-
     const form = scope.myForm;
     control.$setValidity("required", false);
 
@@ -115,8 +113,6 @@ describe("form", () => {
         "</form>",
     )(scope);
 
-    scope.$digest();
-
     const form = scope.myForm;
 
     const input = doc.find("input").eq(0);
@@ -158,8 +154,6 @@ describe("form", () => {
         '<form name="otherForm"></form>',
     )(scope);
 
-    scope.$digest();
-
     const form = scope.myForm;
     const { otherForm } = scope;
     const { childControl } = form;
@@ -173,15 +167,11 @@ 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();
   });
@@ -195,7 +185,6 @@ describe("form", () => {
         "</form></div>",
     )(scope);
 
-    scope.$digest();
     expect(scope.ctrl.myForm).toBeUndefined();
 
     scope.$apply("formPresent = true");
@@ -256,7 +245,6 @@ 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);
@@ -310,8 +298,6 @@ describe("form", () => {
           '<input type="text" ng-model="name" />' +
           "</form>",
       )(scope);
-      scope.$digest();
-
       const inputElm = form.find("input").eq(0);
 
       inputElm[0].setAttribute("value", "a");
@@ -331,8 +317,6 @@ 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"));
@@ -350,8 +334,6 @@ 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"));
@@ -373,8 +355,6 @@ 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"));
@@ -394,8 +374,6 @@ 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"));
@@ -945,8 +923,6 @@ describe("form", () => {
           '<form name="otherForm"></form>',
       )(scope);
 
-      scope.$digest();
-
       const form = scope.myForm;
       const { otherForm } = scope;
       const { childForm } = form;
@@ -960,15 +936,11 @@ 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();
     });
@@ -1013,28 +985,23 @@ 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);
@@ -1042,7 +1009,6 @@ 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);
@@ -1052,7 +1018,6 @@ 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);
@@ -1073,7 +1038,6 @@ 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", () => {
@@ -1110,8 +1074,6 @@ describe("form", () => {
           "</form>",
       )(scope);
 
-      scope.$digest();
-
       const form = doc;
       const formCtrl = scope.testForm;
       const input1 = form.find("input").eq(0);
@@ -1127,8 +1089,6 @@ 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);
@@ -1147,8 +1107,6 @@ 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);
@@ -1160,7 +1118,6 @@ 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);
@@ -1178,8 +1135,6 @@ describe("form", () => {
           "</form>",
       )(scope);
 
-      scope.$digest();
-
       const form = doc;
       const formCtrl = scope.testForm;
       const nestedForm = form.find("div");
@@ -1194,10 +1149,7 @@ 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();
@@ -1216,8 +1168,6 @@ 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();
@@ -1233,8 +1183,6 @@ describe("form", () => {
           "</div>" +
           "</form>",
       )(scope);
-      scope.$digest();
-
       scope.myForm.childForm.alias.$setTouched();
       expect(scope.myForm.childForm.alias.$touched).toBe(true);
       scope.myForm.$setUntouched();
@@ -1247,8 +1195,6 @@ 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([]);
@@ -1264,8 +1210,6 @@ describe("form", () => {
           "</form>",
       )(scope);
 
-      scope.$digest();
-
       const form = doc;
       const formCtrl = scope.testForm;
       const formInput = form.children("input").eq(0);
@@ -1304,7 +1248,6 @@ describe("form", () => {
         "</form>",
     )(scope);
 
-    scope.$digest();
     const formA = scope.form.nestedA;
     expect(formA).toBeDefined();
     expect(formA.$name).toBe("nestedA");
@@ -1315,8 +1258,6 @@ 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();
@@ -1327,7 +1268,6 @@ 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);
@@ -1336,7 +1276,6 @@ 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);
@@ -1347,12 +1286,10 @@ 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);
@@ -1366,8 +1303,6 @@ describe("form", () => {
           '<input type="submit" />' +
           "</form>",
       )(scope);
-
-      scope.$digest();
     });
 
     it("should not init in submitted state", () => {

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

@@ -1,7 +1,6 @@
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
-import { forEach, valueFn } from "../../shared/utils";
+import { valueFn } from "../../shared/utils";
 import { Angular } from "../../loader";
-import { createInjector } from "../../core/di/injector";
 import { wait } from "../../shared/test-utils";
 
 describe("ngIf", () => {
@@ -37,7 +36,7 @@ describe("ngIf", () => {
     });
 
     function makeIf() {
-      forEach(arguments, (expr) => {
+      Array.from(arguments).forEach((expr) => {
         element.append(
           $compile(`<div class="my-class" ng-if="${expr}"><div>Hi</div></div>`)(
             $scope,
@@ -147,8 +146,6 @@ describe("ngIf", () => {
       });
       injector = angular.bootstrap(element, ["myModule"]);
 
-      $rootScope.$digest();
-
       setTimeout(() => {
         expect(element.text()).toBe("Hello");
         done();
@@ -213,7 +210,6 @@ 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);
@@ -269,7 +265,6 @@ 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",
         );

package/src/directive/if/if.test.js

@@ -87,7 +87,7 @@ test.describe("animations", () => {
     await expect(animated).toHaveClass(/ng-enter-active/);
 
     // Wait for the transition to complete
-    await page.waitForTimeout(500);
+    await page.waitForTimeout(100);
     await expect(animated).not.toHaveClass(/ng-enter/);
     await expect(animated).not.toHaveClass(/ng-enter-active/);
 
@@ -106,7 +106,6 @@ test.describe("animations", () => {
     await page.goto("src/directive/if/if-animate-css.html");
     await page.content();
     await page.click('button:has-text("Fade In!")');
-    await page.waitForTimeout(600);
     let animated = await page.locator("#circle");
     await expect(animated).not.toHaveClass(/ng-enter/);
     await expect(animated).not.toHaveClass(/ng-enter-active/);

package/src/directive/include/include.js

@@ -15,7 +15,7 @@ export const ngIncludeDirective = [
    * @returns
    */
   ($templateRequest, $anchorScroll, $animate) => ({
-    restrict: "ECA",
+    restrict: "EA",
     priority: 400,
     terminal: true,
     transclude: "element",
@@ -129,7 +129,7 @@ export const ngIncludeDirective = [
 export const ngIncludeFillContentDirective = [
   "$compile",
   ($compile) => ({
-    restrict: "ECA",
+    restrict: "EA",
     priority: -400,
     require: "ngInclude",
     link(scope, $element, _$attr, ctrl) {