Skip to content

test(sidenav): refactor flaky tests in Edge #16625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2019
Merged

test(sidenav): refactor flaky tests in Edge #16625

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions src/material/sidenav/drawer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ import {
TestBed,
discardPeriodicTasks,
flush,
inject,
} from '@angular/core/testing';
import {Component, ElementRef, ViewChild} from '@angular/core';
import {By} from '@angular/platform-browser';
import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
import {MatDrawer, MatSidenavModule, MatDrawerContainer} from './index';
import {Direction} from '@angular/cdk/bidi';
import {A11yModule} from '@angular/cdk/a11y';
import {PlatformModule} from '@angular/cdk/platform';
import {PlatformModule, Platform} from '@angular/cdk/platform';
import {ESCAPE} from '@angular/cdk/keycodes';
import {dispatchKeyboardEvent, createKeyboardEvent, dispatchEvent} from '@angular/cdk/testing';
import {CdkScrollable} from '@angular/cdk/scrolling';
Expand Down Expand Up @@ -41,40 +42,34 @@ describe('MatDrawer', () => {
describe('methods', () => {
it('should be able to open', fakeAsync(() => {
const fixture = TestBed.createComponent(BasicTestApp);

fixture.detectChanges();

const testComponent: BasicTestApp = fixture.debugElement.componentInstance;
const drawer = fixture.debugElement.query(By.directive(MatDrawer));
const drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
const container = fixture.debugElement.query(By.css('mat-drawer-container')).nativeElement;

drawerBackdropElement.nativeElement.style.transition = 'none';
fixture.debugElement.query(By.css('.open')).nativeElement.click();
fixture.detectChanges();

expect(testComponent.openCount).toBe(0);
expect(testComponent.openStartCount).toBe(0);
expect(container.classList).not.toContain('mat-drawer-opened');

tick();
expect(testComponent.openStartCount).toBe(1);
fixture.detectChanges();

expect(testComponent.openCount).toBe(1);
expect(testComponent.openStartCount).toBe(1);
expect(getComputedStyle(drawer.nativeElement).visibility).toBe('visible');
expect(getComputedStyle(drawerBackdropElement.nativeElement).visibility).toBe('visible');
expect(container.classList).toContain('mat-drawer-opened');
}));

it('should be able to close', fakeAsync(() => {
const fixture = TestBed.createComponent(BasicTestApp);

fixture.detectChanges();

const testComponent: BasicTestApp = fixture.debugElement.componentInstance;
const drawer = fixture.debugElement.query(By.directive(MatDrawer));
const drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
const container = fixture.debugElement.query(By.css('mat-drawer-container')).nativeElement;

drawerBackdropElement.nativeElement.style.transition = 'none';
fixture.debugElement.query(By.css('.open')).nativeElement.click();
fixture.detectChanges();
flush();
Expand All @@ -85,15 +80,15 @@ describe('MatDrawer', () => {

expect(testComponent.closeCount).toBe(0);
expect(testComponent.closeStartCount).toBe(0);
expect(container.classList).toContain('mat-drawer-opened');

flush();
expect(testComponent.closeStartCount).toBe(1);
fixture.detectChanges();

expect(testComponent.closeCount).toBe(1);
expect(testComponent.closeStartCount).toBe(1);
expect(getComputedStyle(drawer.nativeElement).visibility).toBe('hidden');
expect(getComputedStyle(drawerBackdropElement.nativeElement).visibility).toBe('hidden');
expect(container.classList).not.toContain('mat-drawer-opened');
}));

it('should resolve the open method promise with the new state of the drawer', fakeAsync(() => {
Expand Down Expand Up @@ -642,7 +637,7 @@ describe('MatDrawerContainer', () => {
expect(parseInt(contentElement.style.marginRight)).toBe(margin);
}));

it('should not animate when the sidenav is open on load ', fakeAsync(() => {
it('should not animate when the sidenav is open on load', fakeAsync(() => {
TestBed
.resetTestingModule()
.configureTestingModule({
Expand All @@ -662,7 +657,7 @@ describe('MatDrawerContainer', () => {
}));

it('should recalculate the margin if a drawer changes size while open in autosize mode',
fakeAsync(() => {
fakeAsync(inject([Platform], (platform: Platform) => {
const fixture = TestBed.createComponent(AutosizeDrawer);

fixture.detectChanges();
Expand All @@ -671,19 +666,31 @@ describe('MatDrawerContainer', () => {
tick();
fixture.detectChanges();

// IE and Edge are flaky in when they update the styles.
// For them we fall back to checking whether the proper method was called.
const isFlaky = platform.EDGE || platform.TRIDENT;
const contentEl = fixture.debugElement.nativeElement.querySelector('.mat-drawer-content');
const initialMargin = parseInt(contentEl.style.marginLeft);

expect(initialMargin).toBeGreaterThan(0);
if (isFlaky) {
spyOn(fixture.componentInstance.drawerContainer, 'updateContentMargins');
} else {
expect(initialMargin).toBeGreaterThan(0);
}

fixture.componentInstance.fillerWidth = 200;
fixture.detectChanges();
tick(10);
fixture.detectChanges();

expect(parseInt(contentEl.style.marginLeft)).toBeGreaterThan(initialMargin);
if (isFlaky) {
expect(fixture.componentInstance.drawerContainer.updateContentMargins).toHaveBeenCalled();
} else {
expect(parseInt(contentEl.style.marginLeft)).toBeGreaterThan(initialMargin);
}

discardPeriodicTasks();
}));
})));

it('should not set a style property if it would be zero', fakeAsync(() => {
const fixture = TestBed.createComponent(AutosizeDrawer);
Expand Down Expand Up @@ -945,15 +952,16 @@ class DrawerContainerStateChangesTestApp {

@Component({
template: `
<mat-drawer-container autosize>
<mat-drawer-container autosize style="min-height: 200px;">
<mat-drawer mode="push" [position]="drawer1Position">
Text
<div [style.width.px]="fillerWidth"></div>
<div [style.width.px]="fillerWidth" style="height: 200px; background: red;"></div>
</mat-drawer>
</mat-drawer-container>`,
})
class AutosizeDrawer {
@ViewChild(MatDrawer, {static: false}) drawer: MatDrawer;
@ViewChild(MatDrawerContainer, {static: false}) drawerContainer: MatDrawerContainer;
fillerWidth = 0;
}

Expand Down