Skip to content

Commit 8de3b98

Browse files
devversionmmalerba
authored andcommitted
refactor: move testing utilities to cdk (#5437)
* Deletes the duplicate testing utilities because #5386 just copied them to the CDK but didn't delete the old files. * Introduces a secondary entry point (only inside of development right now) that allows us to use the testing utilities from the Material package tests
1 parent ac3e21a commit 8de3b98

36 files changed

+60
-170
lines changed

src/cdk/keyboard/index.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
export * from './keycodes';

src/cdk/public_api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ export * from './platform/index';
1414
export * from './portal/index';
1515
export * from './rxjs/index';
1616
export * from './observe-content/index';
17-
export * from './keyboard/keycodes';
17+
export * from './keyboard/index';

src/cdk/testing/index.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
export * from './dispatch-events';
10+
export * from './event-objects';
11+
export * from './type-in-element';
12+
export * from './wrapped-error-message';

src/cdk/tsconfig-tests.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
"types": ["jasmine"],
1111
"experimentalDecorators": true
1212
},
13+
"files": [
14+
"./index.ts",
15+
"./testing/index.ts"
16+
],
1317
"include": [
14-
"**/*.spec.ts",
15-
"index.ts"
18+
"**/*.spec.ts"
1619
]
1720
}

src/lib/autocomplete/autocomplete.spec.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ import {MdOption} from '../core/option/option';
2626
import {MdInputContainer} from '../input/input-container';
2727
import {Observable} from 'rxjs/Observable';
2828
import {Subject} from 'rxjs/Subject';
29-
import {dispatchFakeEvent} from '../core/testing/dispatch-events';
30-
import {createKeyboardEvent} from '../core/testing/event-objects';
31-
import {typeInElement} from '../core/testing/type-in-element';
29+
import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
3230
import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
3331
import {RxChain, map, startWith, filter} from '../core/rxjs/index';
3432

src/lib/checkbox/checkbox.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {By} from '@angular/platform-browser';
1212
import {MdCheckbox, MdCheckboxChange, MdCheckboxModule} from './index';
1313
import {ViewportRuler} from '../core/overlay/position/viewport-ruler';
1414
import {FakeViewportRuler} from '../core/overlay/position/fake-viewport-ruler';
15-
import {dispatchFakeEvent} from '../core/testing/dispatch-events';
15+
import {dispatchFakeEvent} from '@angular/cdk/testing';
1616
import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer';
1717

1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {By} from '@angular/platform-browser';
44
import {MdChip, MdChipList, MdChipsModule} from './index';
55
import {FocusKeyManager} from '../core/a11y/focus-key-manager';
66
import {SPACE, LEFT_ARROW, RIGHT_ARROW, TAB} from '../core/keyboard/keycodes';
7-
import {createKeyboardEvent} from '../core/testing/event-objects';
7+
import {createKeyboardEvent} from '@angular/cdk/testing';
88

99

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
MD_ELEMENTS_SELECTOR,
88
getMdCompatibilityInvalidPrefixError,
99
} from './compatibility';
10-
import {wrappedErrorMessage} from '../testing/wrapped-error-message';
10+
import {wrappedErrorMessage} from '@angular/cdk/testing';
1111

1212

1313
describe('Style compatibility', () => {

src/lib/core/overlay/overlay-directives.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {OverlayContainer} from './overlay-container';
66
import {ConnectedPositionStrategy} from './position/connected-position-strategy';
77
import {ConnectedOverlayPositionChange} from './position/connected-position';
88
import {Directionality} from '../bidi/index';
9-
import {dispatchKeyboardEvent} from '../testing/dispatch-events';
9+
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
1010
import {ESCAPE} from '../keyboard/keycodes';
1111

1212

src/lib/core/overlay/scroll/scroll-dispatcher.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {inject, TestBed, async, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
22
import {NgModule, Component, ViewChild, ElementRef} from '@angular/core';
33
import {OverlayModule, Scrollable, ScrollDispatcher} from '../index';
4-
import {dispatchFakeEvent} from '../../testing/dispatch-events';
4+
import {dispatchFakeEvent} from '@angular/cdk/testing';
55

66
describe('Scroll Dispatcher', () => {
77

src/lib/core/ripple/ripple.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/
22
import {Component, ViewChild} from '@angular/core';
33
import {ViewportRuler} from '../overlay/position/viewport-ruler';
44
import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
5-
import {dispatchMouseEvent} from '../testing/dispatch-events';
5+
import {dispatchMouseEvent} from '@angular/cdk/testing';
66
import {
77
MdRipple, MdRippleModule, MD_RIPPLE_GLOBAL_OPTIONS, RippleState, RippleGlobalOptions
88
} from './index';

src/lib/core/style/focus-origin-monitor.spec.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import {StyleModule} from './index';
44
import {By} from '@angular/platform-browser';
55
import {TAB} from '../keyboard/keycodes';
66
import {FocusOrigin, FocusOriginMonitor, TOUCH_BUFFER_MS} from './focus-origin-monitor';
7-
import {
8-
dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent
9-
} from '../testing/dispatch-events';
7+
import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
108

119

1210
describe('FocusOriginMonitor', () => {

src/lib/core/testing/dispatch-events.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/lib/core/testing/event-objects.ts

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/lib/core/testing/jasmine-matchers.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/lib/datepicker/calendar.spec.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ import {By} from '@angular/platform-browser';
55
import {MdMonthView} from './month-view';
66
import {MdYearView} from './year-view';
77
import {MdCalendarBody} from './calendar-body';
8-
import {
9-
dispatchFakeEvent,
10-
dispatchKeyboardEvent,
11-
dispatchMouseEvent
12-
} from '../core/testing/dispatch-events';
8+
import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
139
import {
1410
DOWN_ARROW,
1511
END,

src/lib/datepicker/datepicker.spec.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ import {MdDatepickerInput} from './datepicker-input';
99
import {MdInputModule} from '../input/index';
1010
import {MdNativeDateModule, DateAdapter, NativeDateAdapter} from '../core/datetime/index';
1111
import {ESCAPE} from '../core';
12-
import {
13-
dispatchFakeEvent,
14-
dispatchMouseEvent,
15-
dispatchKeyboardEvent,
16-
} from '../core/testing/dispatch-events';
12+
import {dispatchFakeEvent, dispatchMouseEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
1713

1814

1915
// When constructing a Date, the month is zero-based. This can be confusing, since people are

src/lib/dialog/dialog.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {MdDialog, MD_DIALOG_DATA} from './dialog';
2525
import {MdDialogContainer} from './dialog-container';
2626
import {OverlayContainer, ESCAPE} from '../core';
2727
import {MdDialogRef} from './dialog-ref';
28-
import {dispatchKeyboardEvent} from '../core/testing/dispatch-events';
28+
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
2929

3030

3131
describe('MdDialog', () => {

src/lib/icon/icon.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {Component} from '@angular/core';
66
import {MdIconModule} from './index';
77
import {MdIconRegistry, getMdIconNoHttpProviderError} from './icon-registry';
88
import {getFakeSvgHttpResponse} from './fake-svgs';
9-
import {wrappedErrorMessage} from '../core/testing/wrapped-error-message';
9+
import {wrappedErrorMessage} from '@angular/cdk/testing';
1010

1111

1212
/** Returns the CSS classes assigned to an element as a sorted array. */

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ import {MdInputModule} from './index';
1515
import {MdInputContainer, MdInputDirective} from './input-container';
1616
import {Platform} from '../core/platform/platform';
1717
import {PlatformModule} from '../core/platform/index';
18-
import {wrappedErrorMessage} from '../core/testing/wrapped-error-message';
19-
import {dispatchFakeEvent} from '../core/testing/dispatch-events';
18+
import {wrappedErrorMessage, dispatchFakeEvent} from '@angular/cdk/testing';
2019
import {
2120
getMdInputContainerDuplicatedHintError,
2221
getMdInputContainerMissingMdInputError,

src/lib/menu/menu.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {OverlayContainer} from '../core/overlay/overlay-container';
2121
import {Directionality, Direction} from '../core/bidi/index';
2222
import {extendObject} from '../core/util/object-extend';
2323
import {ESCAPE} from '../core/keyboard/keycodes';
24-
import {dispatchKeyboardEvent} from '../core/testing/dispatch-events';
24+
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
2525

2626

2727
describe('MdMenu', () => {

src/lib/paginator/paginator.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import {MdPaginator, PageEvent} from './paginator';
44
import {Component, ElementRef, ViewChild} from '@angular/core';
55
import {MdPaginatorIntl} from './paginator-intl';
66
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
7-
import {customMatchers} from '../core/testing/jasmine-matchers';
8-
import {dispatchMouseEvent} from '../core/testing/dispatch-events';
7+
import {dispatchMouseEvent} from '@angular/cdk/testing';
98

109

1110
describe('MdPaginator', () => {
@@ -14,8 +13,6 @@ describe('MdPaginator', () => {
1413
let paginator: MdPaginator;
1514

1615
beforeEach(async(() => {
17-
jasmine.addMatchers(customMatchers);
18-
1916
TestBed.configureTestingModule({
2017
imports: [
2118
MdPaginatorModule,

src/lib/radio/radio.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {By} from '@angular/platform-browser';
55
import {MdRadioGroup, MdRadioButton, MdRadioChange, MdRadioModule} from './index';
66
import {ViewportRuler} from '../core/overlay/position/viewport-ruler';
77
import {FakeViewportRuler} from '../core/overlay/position/fake-viewport-ruler';
8-
import {dispatchFakeEvent} from '../core/testing/dispatch-events';
8+
import {dispatchFakeEvent} from '@angular/cdk/testing';
99
import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer';
1010

1111

src/lib/select/select.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import {
2222
} from '@angular/forms';
2323
import {Subject} from 'rxjs/Subject';
2424
import {ViewportRuler} from '../core/overlay/position/viewport-ruler';
25-
import {dispatchFakeEvent, dispatchKeyboardEvent} from '../core/testing/dispatch-events';
26-
import {wrappedErrorMessage} from '../core/testing/wrapped-error-message';
25+
import {dispatchFakeEvent, dispatchKeyboardEvent, wrappedErrorMessage} from '@angular/cdk/testing';
2726
import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
2827
import {
2928
FloatPlaceholderType,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {async, ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/t
44
import {NgModel, FormsModule, ReactiveFormsModule, FormControl} from '@angular/forms';
55
import {MdSlideToggle, MdSlideToggleChange, MdSlideToggleModule} from './index';
66
import {TestGestureConfig} from '../slider/test-gesture-config';
7-
import {dispatchFakeEvent} from '../core/testing/dispatch-events';
7+
import {dispatchFakeEvent} from '@angular/cdk/testing';
88
import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer';
99

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

src/lib/slider/slider.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
RIGHT_ARROW,
1616
UP_ARROW
1717
} from '../core/keyboard/keycodes';
18-
import {dispatchKeyboardEvent, dispatchMouseEvent} from '../core/testing/dispatch-events';
18+
import {dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
1919

2020

2121
describe('MdSlider', () => {

src/lib/sort/sort.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import {Component, ElementRef, ViewChild} from '@angular/core';
33
import {MdSort, MdSortHeader, Sort, SortDirection, MdSortModule} from './index';
44
import {CdkTableModule, DataSource, CollectionViewer} from '@angular/cdk';
55
import {Observable} from 'rxjs/Observable';
6-
import {dispatchMouseEvent} from '../core/testing/dispatch-events';
6+
import {dispatchMouseEvent} from '@angular/cdk/testing';
77
import {
88
getMdSortDuplicateMdSortableIdError,
99
getMdSortHeaderMissingIdError,
1010
getMdSortHeaderNotContainedWithinMdSortError
1111
} from './sort-errors';
12-
import {wrappedErrorMessage} from '../core/testing/wrapped-error-message';
12+
import {wrappedErrorMessage} from '@angular/cdk/testing';
1313
import {map} from '../core/rxjs/index';
1414

1515
describe('MdSort', () => {

src/lib/tabs/tab-group.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {Observable} from 'rxjs/Observable';
99
import {MdTab} from './tab';
1010
import {ViewportRuler} from '../core/overlay/position/viewport-ruler';
1111
import {FakeViewportRuler} from '../core/overlay/position/fake-viewport-ruler';
12-
import {dispatchFakeEvent} from '../core/testing/dispatch-events';
12+
import {dispatchFakeEvent} from '@angular/cdk/testing';
1313

1414

1515
describe('MdTabGroup', () => {

src/lib/tabs/tab-header.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import {MdTabLabelWrapper} from './tab-label-wrapper';
1010
import {RIGHT_ARROW, LEFT_ARROW, ENTER} from '../core/keyboard/keycodes';
1111
import {FakeViewportRuler} from '../core/overlay/position/fake-viewport-ruler';
1212
import {ViewportRuler} from '../core/overlay/position/viewport-ruler';
13-
import {dispatchKeyboardEvent} from '../core/testing/dispatch-events';
14-
import {dispatchFakeEvent} from '../core/testing/dispatch-events';
13+
import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
1514
import {Subject} from 'rxjs/Subject';
1615
import {By} from '@angular/platform-browser';
1716

0 commit comments

Comments
 (0)