skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(tooltip): unit test failures (#8385)

Browse Source 
* Fixes a regression in the tooltip that was introduced by 0719c38662 which caused the tests to fail.
* Avoids issues in the future where failures in some tooltip tests can cause Jasmine to throw the browser into an infinite loop by trying to stringify a circular object.
This commit is contained in:
Kristiyan Kostadinov
2017-11-14 17:40:45 +01:00
committed by Jeremy Elbourn
parent 33edff5f14
commit b959014ca5
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/tooltip/tooltip.spec.ts
+27 -19
View File
@@ -53,7 +53,7 @@ describe('MatTooltip', () => {
return {getContainerElement: () => overlayContainerElement};
}},
{provide: Directionality, useFactory: () => {
return dir = { value: 'ltr' };
return dir = {value: 'ltr'};
}}
]
});
@@ -80,7 +80,7 @@ describe('MatTooltip', () => {
});
it('should show and hide the tooltip', fakeAsync(() => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.show();
tick(0); // Tick for the show delay (default is 0)
@@ -110,7 +110,7 @@ describe('MatTooltip', () => {
// On animation complete, should expect that the tooltip has been detached.
flushMicrotasks();
expect(tooltipDirective._tooltipInstance).toBeNull();
assertTooltipInstance(tooltipDirective, false);
}));
it('should be able to re-open a tooltip if it was closed by detaching the overlay',
@@ -126,7 +126,7 @@ describe('MatTooltip', () => {
fixture.detectChanges();
expect(tooltipDirective._isTooltipVisible()).toBe(false);
flushMicrotasks();
expect(tooltipDirective._tooltipInstance).toBeNull();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.show();
tick(0);
@@ -134,7 +134,7 @@ describe('MatTooltip', () => {
}));
it('should show with delay', fakeAsync(() => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
const tooltipDelay = 1000;
tooltipDirective.show(tooltipDelay);
@@ -192,7 +192,7 @@ describe('MatTooltip', () => {
}));
it('should not show if hide is called before delay finishes', async(() => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
const tooltipDelay = 1000;
@@ -209,27 +209,27 @@ describe('MatTooltip', () => {
}));
it('should not show tooltip if message is not present or empty', () => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.message = undefined!;
fixture.detectChanges();
tooltipDirective.show();
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.message = null!;
fixture.detectChanges();
tooltipDirective.show();
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.message = '';
fixture.detectChanges();
tooltipDirective.show();
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.message = ' ';
fixture.detectChanges();
tooltipDirective.show();
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
});
it('should not follow through with hide if show is called after', fakeAsync(() => {
@@ -252,7 +252,7 @@ describe('MatTooltip', () => {
const initialPosition: TooltipPosition = 'below';
const changedPosition: TooltipPosition = 'above';
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.position = initialPosition;
tooltipDirective.show();
@@ -264,12 +264,12 @@ describe('MatTooltip', () => {
// Different position value should destroy the tooltip
tooltipDirective.position = changedPosition;
expect(tooltipDirective._tooltipInstance).toBeNull();
assertTooltipInstance(tooltipDirective, false);
expect(tooltipDirective._overlayRef).toBeNull();
});
it('should be able to modify the tooltip message', fakeAsync(() => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.show();
tick(0); // Tick for the show delay (default is 0)
@@ -286,7 +286,7 @@ describe('MatTooltip', () => {
}));
it('should allow extra classes to be set on the tooltip', fakeAsync(() => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.show();
tick(0); // Tick for the show delay (default is 0)
@@ -510,7 +510,7 @@ describe('MatTooltip', () => {
}));
it('should not show the tooltip on progammatic focus', fakeAsync(() => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
buttonElement.focus();
tick(0);
@@ -585,7 +585,7 @@ describe('MatTooltip', () => {
});
it('should hide tooltip if clipped after changing positions', fakeAsync(() => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
// Show the tooltip and tick for the show delay (default is 0)
tooltipDirective.show();
@@ -626,7 +626,7 @@ describe('MatTooltip', () => {
});
it('should show and hide the tooltip', fakeAsync(() => {
expect(tooltipDirective._tooltipInstance).toBeUndefined();
assertTooltipInstance(tooltipDirective, false);
tooltipDirective.show();
tick(0); // Tick for the show delay (default is 0)
@@ -654,7 +654,7 @@ describe('MatTooltip', () => {
// On animation complete, should expect that the tooltip has been detached.
flushMicrotasks();
expect(tooltipDirective._tooltipInstance).toBeNull();
assertTooltipInstance(tooltipDirective, false);
}));
it('should have rendered the tooltip text on init', fakeAsync(() => {
@@ -751,3 +751,11 @@ class DynamicTooltipsDemo {
return this._elementRef.nativeElement.querySelectorAll('button');
}
}
/** Asserts whether a tooltip directive has a tooltip instance. */
function assertTooltipInstance(tooltip: MatTooltip, shouldExist: boolean): void {
// Note that we have to cast this to a boolean, because Jasmine will go into an infinite loop
// if it tries to stringify the `_tooltipInstance` when an assertion fails. The infinite loop
// happens due to the `_tooltipInstance` having a circular structure.
expect(!!tooltip._tooltipInstance).toBe(shouldExist);
}
src/lib/tooltip/tooltip.ts
+2 -1
View File
@@ -25,6 +25,7 @@ import {
import {Platform} from '@angular/cdk/platform';
import {ComponentPortal} from '@angular/cdk/portal';
import {first} from 'rxjs/operators/first';
import {merge} from 'rxjs/observable/merge';
import {ScrollDispatcher} from '@angular/cdk/scrolling';
import {
ChangeDetectionStrategy,
@@ -261,7 +262,7 @@ export class MatTooltip implements OnDestroy {
this._tooltipInstance = overlayRef.attach(portal).instance;
// Dispose of the tooltip when the overlay is detached.
overlayRef.detachments().subscribe(() => {
merge(this._tooltipInstance!.afterHidden(), overlayRef.detachments()).subscribe(() => {
// Check first if the tooltip has already been removed through this components destroy.
if (this._tooltipInstance) {
this._disposeTooltip();