test(material/table): fix tests

angular · Mar 22, 2024 · 3e8d42e · 3e8d42e
1 parent b87c261
commit 3e8d42e
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 66 deletions.
diff --git a/src/cdk-experimental/table-scroll-container/table-scroll-container.spec.ts b/src/cdk-experimental/table-scroll-container/table-scroll-container.spec.ts
@@ -1,6 +1,6 @@
 import {CollectionViewer, DataSource} from '@angular/cdk/collections';
 import {Component, Type, ViewChild} from '@angular/core';
-import {ComponentFixture, fakeAsync, flushMicrotasks, TestBed} from '@angular/core/testing';
+import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
 import {BehaviorSubject, combineLatest} from 'rxjs';
 import {map} from 'rxjs/operators';
 import {CdkTable, CdkTableModule} from '@angular/cdk/table';
@@ -48,10 +48,10 @@ describe('CdkTableScrollContainer', () => {
     dataRows = getRows(tableElement);
   });
 
-  it('sets scrollbar track margin for sticky headers', fakeAsync(() => {
+  it('sets scrollbar track margin for sticky headers', waitForAsync(async () => {
     component.stickyHeaders = ['header-1', 'header-3'];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     if (platform.FIREFOX) {
       // ::-webkit-scrollbar-track is not recognized by Firefox.
@@ -66,18 +66,18 @@ describe('CdkTableScrollContainer', () => {
 
     component.stickyHeaders = [];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     expect(scrollerStyle.getPropertyValue('margin-top')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-right')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-bottom')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-left')).toBe('0px');
   }));
 
-  it('sets scrollbar track margin for sticky footers', fakeAsync(() => {
+  it('sets scrollbar track margin for sticky footers', waitForAsync(async () => {
     component.stickyFooters = ['footer-1', 'footer-3'];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     if (platform.FIREFOX) {
       // ::-webkit-scrollbar-track is not recognized by Firefox.
@@ -92,18 +92,18 @@ describe('CdkTableScrollContainer', () => {
 
     component.stickyFooters = [];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     expect(scrollerStyle.getPropertyValue('margin-top')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-right')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-bottom')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-left')).toBe('0px');
   }));
 
-  it('sets scrollbar track margin for sticky start columns', fakeAsync(() => {
+  it('sets scrollbar track margin for sticky start columns', waitForAsync(async () => {
     component.stickyStartColumns = ['column-1', 'column-3'];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     if (platform.FIREFOX) {
       // ::-webkit-scrollbar-track is not recognized by Firefox.
@@ -120,18 +120,18 @@ describe('CdkTableScrollContainer', () => {
 
     component.stickyStartColumns = [];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     expect(scrollerStyle.getPropertyValue('margin-top')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-right')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-bottom')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-left')).toBe('0px');
   }));
 
-  it('sets scrollbar track margin for sticky end columns', fakeAsync(() => {
+  it('sets scrollbar track margin for sticky end columns', waitForAsync(async () => {
     component.stickyEndColumns = ['column-4', 'column-6'];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     if (platform.FIREFOX) {
       // ::-webkit-scrollbar-track is not recognized by Firefox.
@@ -148,21 +148,21 @@ describe('CdkTableScrollContainer', () => {
 
     component.stickyEndColumns = [];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     expect(scrollerStyle.getPropertyValue('margin-top')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-right')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-bottom')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-left')).toBe('0px');
   }));
 
-  it('sets scrollbar track margin for a combination of sticky rows and columns', fakeAsync(() => {
+  it('sets scrollbar track margin for a combination of sticky rows and columns', waitForAsync(async () => {
     component.stickyHeaders = ['header-1'];
     component.stickyFooters = ['footer-3'];
     component.stickyStartColumns = ['column-1'];
     component.stickyEndColumns = ['column-6'];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     if (platform.FIREFOX) {
       // ::-webkit-scrollbar-track is not recognized by Firefox.
@@ -184,7 +184,7 @@ describe('CdkTableScrollContainer', () => {
     component.stickyStartColumns = [];
     component.stickyEndColumns = [];
     fixture.detectChanges();
-    flushMicrotasks();
+    await new Promise(r => setTimeout(r));
 
     expect(scrollerStyle.getPropertyValue('margin-top')).toBe('0px');
     expect(scrollerStyle.getPropertyValue('margin-right')).toBe('0px');

diff --git a/src/cdk/table/coalesced-style-scheduler.ts b/src/cdk/table/coalesced-style-scheduler.ts
@@ -15,8 +15,7 @@ import {
   inject,
   Injector,
 } from '@angular/core';
-import {from, Subject} from 'rxjs';
-import {take, takeUntil} from 'rxjs/operators';
+import {Subject} from 'rxjs';
 
 /**
  * @docs-private
@@ -42,7 +41,7 @@ export const _COALESCED_STYLE_SCHEDULER = new InjectionToken<_CoalescedStyleSche
 export class _CoalescedStyleScheduler implements OnDestroy {
   private _currentSchedule: _Schedule | null = null;
   private readonly _destroyed = new Subject<void>();
-
+  private _isDestroyed = false;
   private _injector = inject(Injector);
 
   constructor(private readonly _ngZone: NgZone) {}
@@ -70,6 +69,7 @@ export class _CoalescedStyleScheduler implements OnDestroy {
   ngOnDestroy() {
     this._destroyed.next();
     this._destroyed.complete();
+    this._isDestroyed = true;
   }
 
   private _createScheduleIfNeeded() {
@@ -80,7 +80,11 @@ export class _CoalescedStyleScheduler implements OnDestroy {
     this._currentSchedule = new _Schedule();
 
     this._ngZone.run(() =>
-      queueMicrotask(() =>
+      queueMicrotask(() => {
+        if (this._isDestroyed) {
+          return;
+        }
+
         afterNextRender(
           () => {
             while (this._currentSchedule!.tasks.length || this._currentSchedule!.endTasks.length) {
@@ -101,8 +105,8 @@ export class _CoalescedStyleScheduler implements OnDestroy {
             this._currentSchedule = null;
           },
           {injector: this._injector},
-        ),
-      ),
+        );
+      }),
     );
   }
 }