fix(cdk/tree): restore deleted tests, remove zone change detection

Author: BobobUnicorn

src/material/tree/tree-using-legacy-key-manager.spec.ts

@@ -1,11 +1,4 @@
-import {
-  Component,
-  ElementRef,
-  QueryList,
-  ViewChild,
-  ViewChildren,
-  provideZoneChangeDetection,
-} from '@angular/core';
+import {Component, ElementRef, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {of} from 'rxjs';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {MatTreeModule} from './tree-module';
@@ -20,7 +13,7 @@ describe('MatTree when provided LegacyTreeKeyManager', () => {
     TestBed.configureTestingModule({
       imports: [MatTreeModule],
       declarations: [SimpleMatTreeApp],
-      providers: [provideZoneChangeDetection(), NOOP_TREE_KEY_MANAGER_FACTORY_PROVIDER],
+      providers: [NOOP_TREE_KEY_MANAGER_FACTORY_PROVIDER],
     }).compileComponents();
 
     fixture = TestBed.createComponent(SimpleMatTreeApp);
@@ -40,6 +33,7 @@ describe('MatTree when provided LegacyTreeKeyManager', () => {
   describe('when nodes have TabIndex Input binding of 42', () => {
     beforeEach(() => {
       fixture.componentInstance.tabIndexInputBinding = 42;
+      fixture.changeDetectorRef.markForCheck();
       fixture.detectChanges();
     });
 
@@ -55,6 +49,7 @@ describe('MatTree when provided LegacyTreeKeyManager', () => {
   describe('when nodes have tabindex attribute binding of 2', () => {
     beforeEach(() => {
       fixture.componentInstance.tabindexAttributeBinding = '2';
+      fixture.changeDetectorRef.markForCheck();
       fixture.detectChanges();
     });
 

src/material/tree/tree-using-tree-control.spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {FlatTreeControl, NestedTreeControl, TreeControl} from '@angular/cdk/tree';
-import {provideZoneChangeDetection, Component, ViewChild, Type} from '@angular/core';
+import {Component, ViewChild, Type} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {BehaviorSubject, Observable} from 'rxjs';
 import {map} from 'rxjs/operators';
@@ -28,7 +28,6 @@ describe('MatTree', () => {
   function configureMatTreeTestingModule(declarations: Type<any>[]) {
     TestBed.configureTestingModule({
       imports: [MatTreeModule],
-      providers: [provideZoneChangeDetection()],
       declarations: declarations,
     }).compileComponents();
   }
@@ -64,6 +63,32 @@ describe('MatTree', () => {
         });
       });
 
+      it('with the right aria-level attrs', () => {
+        // add a child to the first node
+        const data = underlyingDataSource.data;
+        underlyingDataSource.addChild(data[2]);
+        component.treeControl.expandAll();
+        fixture.detectChanges();
+
+        const ariaLevels = getNodes(treeElement).map(n => n.getAttribute('aria-level'));
+        expect(ariaLevels).toEqual(['1', '1', '1', '2']);
+      });
+
+      it('with the right aria-expanded attrs', () => {
+        // add a child to the first node
+        const data = underlyingDataSource.data;
+        underlyingDataSource.addChild(data[2]);
+        fixture.detectChanges();
+        let ariaExpandedStates = getNodes(treeElement).map(n => n.getAttribute('aria-expanded'));
+        expect(ariaExpandedStates).toEqual([null, null, 'false']);
+
+        component.treeControl.expandAll();
+        fixture.detectChanges();
+
+        ariaExpandedStates = getNodes(treeElement).map(n => n.getAttribute('aria-expanded'));
+        expect(ariaExpandedStates).toEqual([null, null, 'true', null]);
+      });
+
       it('with the right data', () => {
         expect(underlyingDataSource.data.length).toBe(3);
 
@@ -608,6 +633,7 @@ describe('MatTree', () => {
 
       it('ignores clicks on disabled items', () => {
         underlyingDataSource.data[1].isDisabled = true;
+        fixture.changeDetectorRef.markForCheck();
         fixture.detectChanges();
 
         // attempt to click on the first child

src/material/tree/tree.spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {provideZoneChangeDetection, Component, ViewChild, Type} from '@angular/core';
+import {Component, ViewChild, Type} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {BehaviorSubject, Observable} from 'rxjs';
 import {map} from 'rxjs/operators';
@@ -21,7 +21,6 @@ describe('MatTree', () => {
   function configureMatTreeTestingModule(declarations: Type<any>[]) {
     TestBed.configureTestingModule({
       imports: [MatTreeModule],
-      providers: [provideZoneChangeDetection()],
       declarations: declarations,
     }).compileComponents();
   }
@@ -633,6 +632,7 @@ describe('MatTree', () => {
 
       it('ignores clicks on disabled items', () => {
         underlyingDataSource.data[1].isDisabled = true;
+        fixture.changeDetectorRef.markForCheck();
         fixture.detectChanges();
 
         // attempt to click on the first child