Skip to content

Commit 1951aab

Browse files
committed
fix tests
1 parent 2cdf0bf commit 1951aab

File tree

8 files changed

+15
-16
lines changed

8 files changed

+15
-16
lines changed

src/demo-app/autocomplete/autocomplete-demo.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
display: flex;
33
flex-flow: row wrap;
44

5-
md-card {
5+
.mat-card {
66
width: 350px;
77
margin: 24px;
88
}
99

10-
md-input-container {
10+
.mat-input-container {
1111
margin-top: 16px;
1212
}
1313
}

src/lib/button-toggle/button-toggle.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@import '../core/style/elevation';
22

3-
43
$mat-button-toggle-padding: 0 16px !default;
54
$mat-button-toggle-line-height: 36px !default;
65
$mat-button-toggle-border-radius: 2px !default;
@@ -34,7 +33,7 @@ $mat-button-toggle-border-radius: 2px !default;
3433

3534
.mat-button-toggle {
3635
white-space: nowrap;
37-
font-family: $md-font-family;
36+
font-family: $mat-font-family;
3837
}
3938

4039
.mat-button-toggle-label-content {

src/lib/checkbox/checkbox.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
188188

189189
.mat-checkbox {
190190
cursor: pointer;
191-
font-family: $md-font-family;
191+
font-family: $mat-font-family;
192192

193193
// Animation
194194
transition: background $swift-ease-out-duration $swift-ease-out-timing-function,

src/lib/input/input-container.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ describe('MdInputContainer', function () {
279279
fixture.componentInstance.label = 'label';
280280
fixture.detectChanges();
281281

282-
let hint = fixture.debugElement.query(By.css('.md-hint')).nativeElement;
282+
let hint = fixture.debugElement.query(By.css('.mat-hint')).nativeElement;
283283

284284
expect(hint.getAttribute('id')).toBeTruthy();
285285
});
@@ -435,7 +435,7 @@ describe('MdInputContainer', function () {
435435
fixture.componentInstance.label = 'label';
436436
fixture.detectChanges();
437437

438-
let hint = fixture.debugElement.query(By.css('.md-hint')).nativeElement;
438+
let hint = fixture.debugElement.query(By.css('.mat-hint')).nativeElement;
439439
let input = fixture.debugElement.query(By.css('input')).nativeElement;
440440

441441
expect(input.getAttribute('aria-describedby')).toBe(hint.getAttribute('id'));
@@ -447,7 +447,7 @@ describe('MdInputContainer', function () {
447447
fixture.componentInstance.label = 'label';
448448
fixture.detectChanges();
449449

450-
let hint = fixture.debugElement.query(By.css('.md-hint')).nativeElement;
450+
let hint = fixture.debugElement.query(By.css('.mat-hint')).nativeElement;
451451
let input = fixture.debugElement.query(By.css('input')).nativeElement;
452452

453453
expect(input.getAttribute('aria-describedby')).toBe(hint.getAttribute('id'));
@@ -470,8 +470,8 @@ describe('MdInputContainer', function () {
470470

471471
fixture.detectChanges();
472472

473-
let hintLabel = fixture.debugElement.query(By.css('.md-hint')).nativeElement;
474-
let endLabel = fixture.debugElement.query(By.css('.md-hint[align="end"]')).nativeElement;
473+
let hintLabel = fixture.debugElement.query(By.css('.mat-hint')).nativeElement;
474+
let endLabel = fixture.debugElement.query(By.css('.mat-hint[align="end"]')).nativeElement;
475475
let input = fixture.debugElement.query(By.css('input')).nativeElement;
476476
let ariaValue = input.getAttribute('aria-describedby');
477477

src/lib/radio/radio.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $mat-radio-ripple-size: $mat-radio-size * 0.75;
88
// Top-level host container.
99
.mat-radio-button {
1010
display: inline-block;
11-
font-family: $md-font-family;
11+
font-family: $mat-font-family;
1212
}
1313

1414
// Inner label container, wrapping entire element.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,12 @@ describe('MdSlideToggle', () => {
359359
});
360360

361361
it('should set a element class if labelPosition is set to before', () => {
362-
expect(slideToggleElement.classList).not.toContain('md-slide-toggle-label-before');
362+
expect(slideToggleElement.classList).not.toContain('mat-slide-toggle-label-before');
363363

364364
testComponent.labelPosition = 'before';
365365
fixture.detectChanges();
366366

367-
expect(slideToggleElement.classList).toContain('md-slide-toggle-label-before');
367+
expect(slideToggleElement.classList).toContain('mat-slide-toggle-label-before');
368368
});
369369

370370
});

src/lib/snack-bar/simple-snack-bar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
box-sizing: border-box;
1010
border: none;
1111
color: white;
12-
font-family: $md-font-family;
12+
font-family: $mat-font-family;
1313
font-size: 14px;
1414
line-height: 20px;
1515
outline: none;

src/lib/tooltip/tooltip.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('MdTooltip', () => {
6969
tick(500);
7070

7171
// Make sure tooltip is shown to the user and animation has finished
72-
const tooltipElement = overlayContainerElement.querySelector('.md-tooltip') as HTMLElement;
72+
const tooltipElement = overlayContainerElement.querySelector('.mat-tooltip') as HTMLElement;
7373
expect(tooltipElement instanceof HTMLElement).toBe(true);
7474
expect(tooltipElement.style.transform).toBe('scale(1)');
7575

@@ -339,7 +339,7 @@ describe('MdTooltip', () => {
339339
tick(500);
340340

341341
// Make sure tooltip is shown to the user and animation has finished
342-
const tooltipElement = overlayContainerElement.querySelector('.md-tooltip') as HTMLElement;
342+
const tooltipElement = overlayContainerElement.querySelector('.mat-tooltip') as HTMLElement;
343343
expect(tooltipElement instanceof HTMLElement).toBe(true);
344344
expect(tooltipElement.style.transform).toBe('scale(1)');
345345

0 commit comments

Comments
 (0)