Skip to content

Commit 3c6f7a2

Browse files
authored
chore: fix CI issues (#7432)
1 parent b121e32 commit 3c6f7a2

File tree

8 files changed

+15
-18
lines changed

8 files changed

+15
-18
lines changed

src/lib/autocomplete/autocomplete.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,8 +976,6 @@ describe('MatAutocomplete', () => {
976976
}));
977977

978978
it('should close the panel when tabbing away from a trigger without results', async(() => {
979-
const trigger = fixture.componentInstance.trigger;
980-
981979
fixture.componentInstance.states = [];
982980
fixture.componentInstance.filteredStates = [];
983981
fixture.detectChanges();

src/lib/list/selection-list.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,21 +229,21 @@ describe('MatSelectionList', () => {
229229
});
230230

231231
describe('with list option selected', () => {
232-
let fixture: ComponentFixture<SelectionListWithSelecedOption>;
232+
let fixture: ComponentFixture<SelectionListWithSelectedOption>;
233233
let listItemEl: DebugElement;
234234
let selectionList: DebugElement;
235235

236236
beforeEach(async(() => {
237237
TestBed.configureTestingModule({
238238
imports: [MatListModule],
239-
declarations: [SelectionListWithSelecedOption],
239+
declarations: [SelectionListWithSelectedOption],
240240
});
241241

242242
TestBed.compileComponents();
243243
}));
244244

245245
beforeEach(async(() => {
246-
fixture = TestBed.createComponent(SelectionListWithSelecedOption);
246+
fixture = TestBed.createComponent(SelectionListWithSelectedOption);
247247
listItemEl = fixture.debugElement.query(By.directive(MatListOption));
248248
selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
249249
fixture.detectChanges();
@@ -496,9 +496,9 @@ class SelectionListWithDisabledOption {
496496

497497
@Component({template: `
498498
<mat-selection-list>
499-
<md-list-option [selected]="true">Item</md-list-option>
499+
<mat-list-option [selected]="true">Item</mat-list-option>
500500
</mat-selection-list>`})
501-
class SelectionListWithSelecedOption {
501+
class SelectionListWithSelectedOption {
502502
}
503503

504504
@Component({template: `

src/lib/menu/menu-directive.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
import {Observable} from 'rxjs/Observable';
3333
import {merge} from 'rxjs/observable/merge';
3434
import {Subscription} from 'rxjs/Subscription';
35-
import {Subject} from 'rxjs/Subject';
3635
import {fadeInItems, transformMenu} from './menu-animations';
3736
import {throwMatMenuInvalidPositionX, throwMatMenuInvalidPositionY} from './menu-errors';
3837
import {MatMenuItem} from './menu-item';

src/lib/select/select.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -879,10 +879,10 @@ describe('MatSelect', () => {
879879
fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
880880
fixture.detectChanges();
881881

882-
(overlayContainerElement.querySelector('md-option') as HTMLElement).click();
882+
(overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
883883
fixture.detectChanges();
884884

885-
const select = fixture.debugElement.nativeElement.querySelector('md-select');
885+
const select = fixture.debugElement.nativeElement.querySelector('mat-select');
886886

887887
expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
888888
});
@@ -2347,7 +2347,7 @@ describe('MatSelect', () => {
23472347
});
23482348

23492349
it('should only emit one event when pressing the arrow keys on a closed select', () => {
2350-
const select = fixture.debugElement.query(By.css('md-select')).nativeElement;
2350+
const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
23512351
dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
23522352

23532353
expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);

src/lib/sidenav/drawer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import {first} from 'rxjs/operator/first';
3737
import {startWith} from 'rxjs/operator/startWith';
3838
import {takeUntil} from 'rxjs/operator/takeUntil';
3939
import {Subject} from 'rxjs/Subject';
40-
import {Subscription} from 'rxjs/Subscription';
4140

4241

4342
/** Throws an exception when two MatDrawer are matching the same position. */

src/lib/slide-toggle/slide-toggle.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ class SlideToggleWithoutLabel {
894894
}
895895

896896
@Component({
897-
template: `<md-slide-toggle [(ngModel)]="checked" (change)="onChange()"></md-slide-toggle>`
897+
template: `<mat-slide-toggle [(ngModel)]="checked" (change)="onChange()"></mat-slide-toggle>`
898898
})
899899
class SlideToggleWithModelAndChangeEvent {
900900
checked: boolean;

src/lib/stepper/step-header.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import {FocusMonitor} from '@angular/cdk/a11y';
1010
import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
1111
import {Component, Input, ViewEncapsulation, ElementRef, OnDestroy, Renderer2} from '@angular/core';
12-
import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
1312
import {MatStepLabel} from './step-label';
1413

1514

src/lib/tooltip/tooltip.spec.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,21 @@ describe('MatTooltip', () => {
171171
expect(tooltipDirective._isTooltipVisible()).toBe(false);
172172
}));
173173

174-
it('should not show if hide is called before delay finishes', fakeAsync(() => {
174+
it('should not show if hide is called before delay finishes', async(() => {
175175
expect(tooltipDirective._tooltipInstance).toBeUndefined();
176176

177177
const tooltipDelay = 1000;
178+
178179
tooltipDirective.show(tooltipDelay);
179180
expect(tooltipDirective._isTooltipVisible()).toBe(false);
180181

181182
fixture.detectChanges();
182183
expect(overlayContainerElement.textContent).toContain('');
183-
184184
tooltipDirective.hide();
185-
tick(tooltipDelay);
186-
expect(tooltipDirective._isTooltipVisible()).toBe(false);
185+
186+
fixture.whenStable().then(() => {
187+
expect(tooltipDirective._isTooltipVisible()).toBe(false);
188+
});
187189
}));
188190

189191
it('should not show tooltip if message is not present or empty', () => {

0 commit comments

Comments
 (0)