Skip to content

Commit b910b0b

Browse files
jelbournjelbourn
committed
tests
1 parent 0c4f08a commit b910b0b

File tree

13 files changed

+112
-103
lines changed

13 files changed

+112
-103
lines changed

‎src/lib/autocomplete/autocomplete.spec.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
1+
import {Direction, Directionality} from '@angular/cdk/bidi';
2+
import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
3+
import {OverlayContainer} from '@angular/cdk/overlay';
4+
import {map, RxChain, startWith} from '@angular/cdk/rxjs';
5+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
6+
import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
27
import {
38
ChangeDetectionStrategy,
49
Component,
@@ -8,28 +13,23 @@ import {
813
ViewChild,
914
ViewChildren,
1015
} from '@angular/core';
16+
import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
17+
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
18+
import {MdOption} from '@angular/material/core';
19+
import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
1120
import {By} from '@angular/platform-browser';
1221
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
13-
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
14-
import {ScrollDispatcher} from '@angular/cdk/scrolling';
15-
import {OverlayContainer} from '@angular/cdk/overlay';
16-
import {Direction, Directionality} from '@angular/cdk/bidi';
17-
import {map, RxChain, startWith} from '@angular/cdk/rxjs';
18-
import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
22+
import {Observable} from 'rxjs/Observable';
23+
import {Subject} from 'rxjs/Subject';
24+
import {Subscription} from 'rxjs/Subscription';
25+
import {MdInputModule} from '../input/index';
1926
import {
2027
getMdAutocompleteMissingPanelError,
2128
MdAutocomplete,
2229
MdAutocompleteModule,
23-
MdAutocompleteTrigger,
2430
MdAutocompleteSelectedEvent,
31+
MdAutocompleteTrigger,
2532
} from './index';
26-
import {MdInputModule} from '../input/index';
27-
import {Subscription} from 'rxjs/Subscription';
28-
import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/material/core';
29-
import {MdOption} from '@angular/material/core';
30-
import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
31-
import {Observable} from 'rxjs/Observable';
32-
import {Subject} from 'rxjs/Subject';
3333

3434

3535
describe('MdAutocomplete', () => {

‎src/lib/chips/chip-input.spec.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import {async, TestBed, ComponentFixture} from '@angular/core/testing';
2-
import {MdChipsModule} from './index';
1+
import {Directionality} from '@angular/cdk/bidi';
2+
import {ENTER} from '@angular/cdk/keycodes';
3+
import {createKeyboardEvent} from '@angular/cdk/testing';
34
import {Component, DebugElement} from '@angular/core';
4-
import {MdChipInput, MdChipInputEvent} from './chip-input';
5+
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
56
import {By} from '@angular/platform-browser';
6-
import {Directionality} from '@angular/material/core';
7-
import {createKeyboardEvent} from '@angular/cdk/testing';
8-
9-
import {ENTER} from '@angular/material/core';
7+
import {MdChipInput, MdChipInputEvent} from './chip-input';
8+
import {MdChipsModule} from './index';
109

1110
const COMMA = 188;
1211

‎src/lib/chips/chip-list.spec.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
import {FocusKeyManager} from '@angular/cdk/a11y';
2+
import {Directionality} from '@angular/cdk/bidi';
3+
import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, TAB,} from '@angular/cdk/keycodes';
24
import {createKeyboardEvent} from '@angular/cdk/testing';
35
import {Component, DebugElement, QueryList} from '@angular/core';
46
import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
5-
import {
6-
BACKSPACE,
7-
DELETE,
8-
Directionality,
9-
LEFT_ARROW,
10-
RIGHT_ARROW,
11-
TAB,
12-
} from '@angular/material/core';
137
import {MdFormFieldModule} from '@angular/material/form-field';
148
import {By} from '@angular/platform-browser';
159
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
16-
1710
import {MdInputModule} from '../input/index';
1811
import {MdChip} from './chip';
1912
import {MdChipList, MdChipsModule} from './index';

‎src/lib/chips/chip.spec.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import {Directionality} from '@angular/cdk/bidi';
2+
import {BACKSPACE, DELETE, SPACE} from '@angular/cdk/keycodes';
3+
import {createKeyboardEvent} from '@angular/cdk/testing';
4+
import {Component, DebugElement} from '@angular/core';
15
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
2-
import {Component, DebugElement} from '@angular/core';
36
import {By} from '@angular/platform-browser';
4-
import {createKeyboardEvent} from '@angular/cdk/testing';
5-
import {MdChipList, MdChip, MdChipEvent, MdChipsModule} from './index';
6-
import {SPACE, DELETE, BACKSPACE} from '@angular/material/core';
7-
import {Directionality} from '@angular/material/core';
7+
import {MdChip, MdChipEvent, MdChipList, MdChipsModule} from './index';
8+
89

910
describe('Chips', () => {
1011
let fixture: ComponentFixture<any>;

‎src/lib/core/compatibility/compatibility.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ describe('Style compatibility', () => {
9090

9191

9292
@Component({ template: `<md-checkbox>Hungry</md-checkbox>` })
93-
class ComponentWithMdCheckbox { }
93+
export class ComponentWithMdCheckbox { }
9494

9595
@Component({ template: `<mat-checkbox>Hungry</mat-checkbox>` })
96-
class ComponentWithMatCheckbox { }
96+
export class ComponentWithMatCheckbox { }
9797

9898

9999
@NgModule({

‎src/lib/core/datetime/native-date-adapter.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {TestBed, async, inject} from '@angular/core/testing';
2-
import {NativeDateAdapter, NativeDateModule, DateAdapter, MAT_DATE_LOCALE} from './index';
3-
import {Platform} from '../platform/index';
4-
import {DEC, FEB, JAN, MAR} from '../testing/month-constants';
1+
import {Platform} from '@angular/cdk/platform';
52
import {LOCALE_ID} from '@angular/core';
3+
import {async, inject, TestBed} from '@angular/core/testing';
4+
import {DEC, FEB, JAN, MAR} from '../testing/month-constants';
5+
import {DateAdapter, MAT_DATE_LOCALE, NativeDateAdapter, NativeDateModule} from './index';
66

77
const SUPPORTS_INTL = typeof Intl != 'undefined';
88

‎src/lib/datepicker/calendar.spec.ts

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
2-
import {Component} from '@angular/core';
3-
import {MdCalendar} from './calendar';
4-
import {By} from '@angular/platform-browser';
5-
import {MdMonthView} from './month-view';
6-
import {MdYearView} from './year-view';
7-
import {MdCalendarBody} from './calendar-body';
8-
import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
91
import {
102
DOWN_ARROW,
113
END,
@@ -15,13 +7,33 @@ import {
157
PAGE_DOWN,
168
PAGE_UP,
179
RIGHT_ARROW,
18-
UP_ARROW
10+
UP_ARROW,
11+
} from '@angular/cdk/keycodes';
12+
import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
13+
import {Component} from '@angular/core';
14+
import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
15+
import {
16+
AUG,
17+
DEC,
18+
FEB,
19+
JAN,
20+
JUL,
21+
JUN,
22+
MAR,
23+
MAY,
24+
MdNativeDateModule,
25+
NoConflictStyleCompatibilityMode,
26+
NOV,
27+
SEP,
1928
} from '@angular/material/core';
20-
import {MdDatepickerIntl} from './datepicker-intl';
21-
import {MdNativeDateModule} from '@angular/material/core';
22-
import {NoConflictStyleCompatibilityMode} from '@angular/material/core';
29+
import {By} from '@angular/platform-browser';
2330
import {MdButtonModule} from '../button/index';
24-
import {AUG, DEC, FEB, JAN, JUL, NOV, MAR, MAY, JUN, SEP} from '@angular/material/core';
31+
import {MdCalendar} from './calendar';
32+
import {MdCalendarBody} from './calendar-body';
33+
import {MdDatepickerIntl} from './datepicker-intl';
34+
import {MdMonthView} from './month-view';
35+
import {MdYearView} from './year-view';
36+
2537

2638
describe('MdCalendar', () => {
2739
beforeEach(async(() => {

‎src/lib/input/input.spec.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1+
import {Platform, PlatformModule} from '@angular/cdk/platform';
2+
import {createFakeEvent, dispatchFakeEvent, wrappedErrorMessage} from '@angular/cdk/testing';
3+
import {ChangeDetectionStrategy, Component, ViewChild} from '@angular/core';
14
import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
2-
import {Component, ViewChild, ChangeDetectionStrategy} from '@angular/core';
35
import {
46
FormControl,
57
FormGroup,
68
FormGroupDirective,
79
FormsModule,
810
NgForm,
911
ReactiveFormsModule,
10-
Validators
12+
Validators,
1113
} from '@angular/forms';
12-
import {By} from '@angular/platform-browser';
13-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
14-
import {MdInputModule} from './index';
15-
import {MdInput} from './input';
16-
import {Platform} from '@angular/material/core';
17-
import {PlatformModule} from '@angular/material/core';
18-
import {wrappedErrorMessage, dispatchFakeEvent, createFakeEvent} from '@angular/cdk/testing';
1914
import {
20-
MdFormField,
21-
MdFormFieldModule,
15+
MD_ERROR_GLOBAL_OPTIONS,
16+
MD_PLACEHOLDER_GLOBAL_OPTIONS,
17+
showOnDirtyErrorStateMatcher,
18+
} from '@angular/material/core';
19+
import {
2220
getMdFormFieldDuplicatedHintError,
2321
getMdFormFieldMissingControlError,
2422
getMdFormFieldPlaceholderConflictError,
23+
MdFormField,
24+
MdFormFieldModule,
2525
} from '@angular/material/form-field';
26-
import {MD_PLACEHOLDER_GLOBAL_OPTIONS} from '@angular/material/core';
27-
import {MD_ERROR_GLOBAL_OPTIONS, showOnDirtyErrorStateMatcher} from '@angular/material/core';
26+
import {By} from '@angular/platform-browser';
27+
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
28+
import {MdInputModule} from './index';
29+
import {MdInput} from './input';
2830

2931
describe('MdInput without forms', function () {
3032
beforeEach(async(() => {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {async, TestBed, ComponentFixture, inject} from '@angular/core/testing';
1+
import {DOWN_ARROW, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
2+
import {Platform} from '@angular/cdk/platform';
3+
import {createKeyboardEvent} from '@angular/cdk/testing';
24
import {Component, DebugElement} from '@angular/core';
5+
import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
36
import {By} from '@angular/platform-browser';
4-
import {MdSelectionList, MdListOption, MdListModule} from './index';
5-
import {createKeyboardEvent} from '@angular/cdk/testing';
6-
import {UP_ARROW, DOWN_ARROW, SPACE} from '@angular/material/core';
7-
import {Platform} from '@angular/material/core';
7+
import {MdListModule, MdListOption, MdSelectionList} from './index';
88

99

1010
describe('MdSelectionList', () => {

‎src/lib/slider/slider.spec.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
2-
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
3-
import {Component, DebugElement, ViewChild} from '@angular/core';
4-
import {By, HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
5-
import {MdSlider, MdSliderModule} from './index';
6-
import {TestGestureConfig} from './test-gesture-config';
7-
import {BidiModule} from '@angular/material/core';
1+
import {BidiModule} from '@angular/cdk/bidi';
82
import {
3+
BACKSPACE,
94
DOWN_ARROW,
105
END,
116
HOME,
@@ -14,9 +9,15 @@ import {
149
PAGE_UP,
1510
RIGHT_ARROW,
1611
UP_ARROW,
17-
BACKSPACE
18-
} from '@angular/material/core';
12+
} from '@angular/cdk/keycodes';
1913
import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
14+
import {Component, DebugElement, ViewChild} from '@angular/core';
15+
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
16+
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
17+
import {By, HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
18+
import {MdSlider, MdSliderModule} from './index';
19+
import {TestGestureConfig} from './test-gesture-config';
20+
2021

2122
describe('MdSlider without forms', () => {
2223
let gestureConfig: TestGestureConfig;

‎src/lib/sort/sort.spec.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
import {async, ComponentFixture, TestBed, inject} from '@angular/core/testing';
1+
import {CollectionViewer, DataSource} from '@angular/cdk/collections';
2+
import {CdkTableModule} from '@angular/cdk/table';
3+
import {dispatchMouseEvent, wrappedErrorMessage} from '@angular/cdk/testing';
24
import {Component, ElementRef, ViewChild} from '@angular/core';
5+
import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
36
import {By} from '@angular/platform-browser';
47
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
5-
import {MdSort, MdSortHeader, Sort, SortDirection, MdSortModule, MdSortHeaderIntl} from './index';
6-
import {DataSource, CollectionViewer} from '@angular/cdk/collections';
7-
import {CdkTableModule} from '@angular/cdk/table';
88
import {Observable} from 'rxjs/Observable';
9+
import {map} from 'rxjs/operator/map';
10+
import {MdTableModule} from '../table/index';
11+
import {MdSort, MdSortHeader, MdSortHeaderIntl, MdSortModule, Sort, SortDirection} from './index';
912
import {
1013
getMdSortDuplicateMdSortableIdError,
1114
getMdSortHeaderMissingIdError,
12-
getMdSortHeaderNotContainedWithinMdSortError
15+
getMdSortHeaderNotContainedWithinMdSortError,
1316
} from './sort-errors';
14-
import {wrappedErrorMessage, dispatchMouseEvent} from '@angular/cdk/testing';
15-
import {map} from '@angular/material/core';
16-
import {MdTableModule} from '../table/index';
17+
1718

1819
describe('MdSort', () => {
1920
let fixture: ComponentFixture<SimpleMdSortApp>;

‎src/lib/stepper/stepper.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
1+
import {Directionality} from '@angular/cdk/bidi';
2+
import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
3+
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
24
import {Component, DebugElement} from '@angular/core';
3-
import {MdStepperModule} from './index';
5+
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
6+
import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
47
import {By} from '@angular/platform-browser';
58
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
6-
import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
9+
import {MdStepperModule} from './index';
10+
import {MdHorizontalStepper, MdStepper, MdVerticalStepper} from './stepper';
711
import {MdStepperNext, MdStepperPrevious} from './stepper-button';
8-
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
9-
import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
10-
import {MdStepper, MdHorizontalStepper, MdVerticalStepper} from './stepper';
11-
import {Directionality} from '@angular/material/core';
12+
1213

1314
const VALID_REGEX = /valid/;
1415

‎src/lib/tabs/tab-body.spec.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import {Component, ViewChild, TemplateRef, ViewContainerRef} from '@angular/core';
1+
import {Direction, Directionality} from '@angular/cdk/bidi';
2+
import {PortalModule, TemplatePortal} from '@angular/cdk/portal';
23
import {CommonModule} from '@angular/common';
3-
import {PortalModule} from '@angular/cdk/portal';
4-
import {async, ComponentFixture, TestBed, flushMicrotasks, fakeAsync} from '@angular/core/testing';
4+
import {Component, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
5+
import {async, ComponentFixture, fakeAsync, flushMicrotasks, TestBed} from '@angular/core/testing';
6+
import {MdRippleModule} from '@angular/material/core';
57
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
6-
import {Direction, Directionality} from '@angular/material/core';
7-
import {TemplatePortal} from '@angular/material/core';
88
import {MdTabBody} from './tab-body';
9-
import {MdRippleModule} from '@angular/material/core';
109

1110

1211
describe('MdTabBody', () => {

0 commit comments

Comments
 (0)