Skip to content

Commit c6c1dd0

Browse files
jelbournjelbourn
committed
remove deprecated methods
1 parent 0a5ed02 commit c6c1dd0

File tree

11 files changed

+92
-80
lines changed

11 files changed

+92
-80
lines changed

‎src/components/button-toggle/button-toggle.spec.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
import {
2-
it,
3-
describe,
4-
beforeEach,
5-
beforeEachProviders,
2+
addProviders,
63
inject,
74
async,
85
fakeAsync,
96
tick,
107
} from '@angular/core/testing';
118
import {NgControl, disableDeprecatedForms, provideForms} from '@angular/forms';
129
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
13-
import {Component, DebugElement, provide} from '@angular/core';
10+
import {Component, DebugElement} from '@angular/core';
1411
import {By} from '@angular/platform-browser';
1512
import {
1613
MD_BUTTON_TOGGLE_DIRECTIVES,
@@ -28,14 +25,16 @@ describe('MdButtonToggle', () => {
2825
let builder: TestComponentBuilder;
2926
let dispatcher: MdUniqueSelectionDispatcher;
3027

31-
beforeEachProviders(() => [
32-
disableDeprecatedForms(),
33-
provideForms(),
34-
provide(MdUniqueSelectionDispatcher, {useFactory: () => {
35-
dispatcher = new MdUniqueSelectionDispatcher();
36-
return dispatcher;
37-
}})
38-
]);
28+
beforeEach(() => {
29+
addProviders([
30+
disableDeprecatedForms(),
31+
provideForms(),
32+
{provide: MdUniqueSelectionDispatcher, useFactory: () => {
33+
dispatcher = new MdUniqueSelectionDispatcher();
34+
return dispatcher;
35+
}}
36+
]);
37+
});
3938

4039
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
4140
builder = tcb;

‎src/components/checkbox/checkbox.spec.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
beforeEachProviders,
2+
addProviders,
33
inject,
44
async,
55
fakeAsync,
@@ -26,10 +26,12 @@ describe('MdCheckbox', () => {
2626
let builder: TestComponentBuilder;
2727
let fixture: ComponentFixture<any>;
2828

29-
beforeEachProviders(() => [
30-
disableDeprecatedForms(),
31-
provideForms(),
32-
]);
29+
beforeEach(() => {
30+
addProviders([
31+
disableDeprecatedForms(),
32+
provideForms(),
33+
]);
34+
});
3335

3436
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
3537
builder = tcb;

‎src/components/icon/icon.spec.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {
2-
beforeEachProviders,
2+
addProviders,
33
inject,
44
} from '@angular/core/testing';
55
import {TestComponentBuilder} from '@angular/compiler/testing';
66
import {HTTP_PROVIDERS, XHRBackend} from '@angular/http';
77
import {MockBackend} from '@angular/http/testing';
8-
import {provide, Component} from '@angular/core';
8+
import {Component} from '@angular/core';
99
import {MdIcon} from './icon';
1010
import {MdIconRegistry} from './icon-registry';
1111
import {getFakeSvgHttpResponse} from './fake-svgs';
@@ -38,12 +38,15 @@ const verifyPathChildElement = (element: Element, attributeValue: string) => {
3838

3939
describe('MdIcon', () => {
4040

41-
beforeEachProviders(() => [
42-
MdIconRegistry,
43-
HTTP_PROVIDERS,
44-
MockBackend,
45-
provide(XHRBackend, {useExisting: MockBackend}),
46-
]);
41+
beforeEach(() => {
42+
addProviders([
43+
MdIconRegistry,
44+
HTTP_PROVIDERS,
45+
MockBackend,
46+
{provide: XHRBackend, useExisting: MockBackend},
47+
]);
48+
});
49+
4750

4851
let builder: TestComponentBuilder;
4952
let mdIconRegistry: MdIconRegistry;

‎src/components/input/input.spec.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
beforeEachProviders,
2+
addProviders,
33
fakeAsync,
44
inject,
55
tick,
@@ -17,10 +17,12 @@ import {
1717
describe('MdInput', function () {
1818
var builder: TestComponentBuilder;
1919

20-
beforeEachProviders(() => [
21-
disableDeprecatedForms(),
22-
provideForms(),
23-
]);
20+
beforeEach(() => {
21+
addProviders([
22+
disableDeprecatedForms(),
23+
provideForms(),
24+
]);
25+
});
2426

2527
beforeEach(inject([TestComponentBuilder], function (tcb: TestComponentBuilder) {
2628
builder = tcb;

‎src/components/radio/radio.spec.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {
2-
beforeEachProviders,
2+
addProviders,
33
inject,
44
async,
55
fakeAsync,
66
tick
77
} from '@angular/core/testing';
88
import {FORM_DIRECTIVES, NgControl, disableDeprecatedForms, provideForms} from '@angular/forms';
99
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
10-
import {Component, DebugElement, provide} from '@angular/core';
10+
import {Component, DebugElement} from '@angular/core';
1111
import {By} from '@angular/platform-browser';
1212
import {MD_RADIO_DIRECTIVES, MdRadioGroup, MdRadioButton, MdRadioChange} from './radio';
1313
import {
@@ -19,14 +19,16 @@ describe('MdRadio', () => {
1919
let builder: TestComponentBuilder;
2020
let dispatcher: MdUniqueSelectionDispatcher;
2121

22-
beforeEachProviders(() => [
23-
disableDeprecatedForms(),
24-
provideForms(),
25-
provide(MdUniqueSelectionDispatcher, {useFactory: () => {
26-
dispatcher = new MdUniqueSelectionDispatcher();
27-
return dispatcher;
28-
}})
29-
]);
22+
beforeEach(() => {
23+
addProviders([
24+
disableDeprecatedForms(),
25+
provideForms(),
26+
{provide: MdUniqueSelectionDispatcher, useFactory: () => {
27+
dispatcher = new MdUniqueSelectionDispatcher();
28+
return dispatcher;
29+
}},
30+
]);
31+
});
3032

3133
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
3234
builder = tcb;

‎src/components/slide-toggle/slide-toggle.spec.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
beforeEachProviders,
2+
addProviders,
33
inject,
44
async
55
} from '@angular/core/testing';
@@ -12,10 +12,12 @@ import {NgControl, disableDeprecatedForms, provideForms} from '@angular/forms';
1212
describe('MdSlideToggle', () => {
1313
let builder: TestComponentBuilder;
1414

15-
beforeEachProviders(() => [
16-
disableDeprecatedForms(),
17-
provideForms(),
18-
]);
15+
beforeEach(() => {
16+
addProviders([
17+
disableDeprecatedForms(),
18+
provideForms(),
19+
]);
20+
});
1921

2022
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
2123
builder = tcb;

‎src/core/a11y/live-announcer.spec.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import {
33
fakeAsync,
44
flushMicrotasks,
55
tick,
6-
beforeEachProviders,
6+
addProviders,
77
getTestInjector
88
} from '@angular/core/testing';
99
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
10-
import {Component, provide} from '@angular/core';
10+
import {Component} from '@angular/core';
1111
import {By} from '@angular/platform-browser';
1212
import {MdLiveAnnouncer, LIVE_ANNOUNCER_ELEMENT_TOKEN} from './live-announcer';
1313

@@ -16,7 +16,11 @@ describe('MdLiveAnnouncer', () => {
1616
let builder: TestComponentBuilder;
1717
let liveEl: Element;
1818

19-
beforeEachProviders(() => [MdLiveAnnouncer]);
19+
beforeEach(() => {
20+
addProviders([
21+
MdLiveAnnouncer,
22+
]);
23+
});
2024

2125
beforeEach(inject([TestComponentBuilder, MdLiveAnnouncer],
2226
(tcb: TestComponentBuilder, _live: MdLiveAnnouncer) => {
@@ -94,7 +98,7 @@ describe('MdLiveAnnouncer', () => {
9498
getTestInjector().reset();
9599

96100
getTestInjector().addProviders([
97-
provide(LIVE_ANNOUNCER_ELEMENT_TOKEN, {useValue: customLiveEl}),
101+
{provide: LIVE_ANNOUNCER_ELEMENT_TOKEN, useValue: customLiveEl},
98102
MdLiveAnnouncer
99103
]);
100104

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import {
33
async,
44
fakeAsync,
55
flushMicrotasks,
6-
beforeEachProviders
6+
addProviders,
77
} from '@angular/core/testing';
88
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
9-
import {Component, provide, ViewChild} from '@angular/core';
9+
import {Component, ViewChild} from '@angular/core';
1010
import {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
1111
import {OVERLAY_CONTAINER_TOKEN, Overlay} from './overlay';
1212
import {ViewportRuler} from './position/viewport-ruler';
@@ -19,15 +19,17 @@ describe('Overlay directives', () => {
1919
let overlayContainerElement: HTMLElement;
2020
let fixture: ComponentFixture<ConnectedOverlayDirectiveTest>;
2121

22-
beforeEachProviders(() => [
23-
Overlay,
24-
OverlayPositionBuilder,
25-
ViewportRuler,
26-
provide(OVERLAY_CONTAINER_TOKEN, {useFactory: () => {
27-
overlayContainerElement = document.createElement('div');
28-
return overlayContainerElement;
29-
}})
30-
]);
22+
beforeEach(() => {
23+
addProviders([
24+
Overlay,
25+
OverlayPositionBuilder,
26+
ViewportRuler,
27+
{provide: OVERLAY_CONTAINER_TOKEN, useFactory: () => {
28+
overlayContainerElement = document.createElement('div');
29+
return overlayContainerElement;
30+
}},
31+
]);
32+
});
3133

3234
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
3335
builder = tcb;

‎src/core/overlay/overlay.spec.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import {
22
inject,
33
fakeAsync,
44
flushMicrotasks,
5-
beforeEachProviders,
5+
addProviders,
66
} from '@angular/core/testing';
77
import {TestComponentBuilder} from '@angular/compiler/testing';
88
import {
99
Component,
1010
ViewChild,
11-
provide, ViewContainerRef,
11+
ViewContainerRef,
1212
} from '@angular/core';
1313
import {TemplatePortalDirective} from '../portal/portal-directives';
1414
import {TemplatePortal, ComponentPortal} from '../portal/portal';
@@ -27,17 +27,17 @@ describe('Overlay', () => {
2727
let templatePortal: TemplatePortal;
2828
let overlayContainerElement: HTMLElement;
2929

30-
beforeEachProviders(() => [
31-
Overlay,
32-
OverlayPositionBuilder,
33-
ViewportRuler,
34-
provide(OVERLAY_CONTAINER_TOKEN, {
35-
useFactory: () => {
30+
beforeEach(() => {
31+
addProviders([
32+
Overlay,
33+
OverlayPositionBuilder,
34+
ViewportRuler,
35+
{provide: OVERLAY_CONTAINER_TOKEN, useFactory: () => {
3636
overlayContainerElement = document.createElement('div');
3737
return overlayContainerElement;
38-
}
39-
})
40-
]);
38+
}}
39+
]);
40+
});
4141

4242
let deps = [TestComponentBuilder, Overlay];
4343
beforeEach(inject(deps, fakeAsync((tcb: TestComponentBuilder, o: Overlay) => {

‎src/demo-app/main.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import {bootstrap} from '@angular/platform-browser-dynamic';
22
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
33
import {HTTP_PROVIDERS} from '@angular/http';
4-
import {provide} from '@angular/core';
5-
import {Renderer} from '@angular/core';
64
import {disableDeprecatedForms, provideForms} from '@angular/forms';
75

86
import {OVERLAY_CONTAINER_TOKEN} from '@angular2-material/core/overlay/overlay';
@@ -19,9 +17,8 @@ bootstrap(DemoApp, [
1917
disableDeprecatedForms(),
2018
provideForms(),
2119
MdLiveAnnouncer,
22-
provide(OVERLAY_CONTAINER_TOKEN, {useValue: createOverlayContainer()}),
20+
{provide: OVERLAY_CONTAINER_TOKEN, useValue: createOverlayContainer()},
2321
HTTP_PROVIDERS,
2422
MdIconRegistry,
25-
Renderer,
26-
provide(HAMMER_GESTURE_CONFIG, {useClass: MdGestureConfig}),
23+
{provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig},
2724
]);

‎src/e2e-app/main.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {bootstrap} from '@angular/platform-browser-dynamic';
22
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
33
import {HTTP_PROVIDERS} from '@angular/http';
4-
import {provide} from '@angular/core';
54
import {Renderer} from '@angular/core';
65
import {disableDeprecatedForms, provideForms} from '@angular/forms';
76

@@ -19,9 +18,9 @@ bootstrap(E2EApp, [
1918
disableDeprecatedForms(),
2019
provideForms(),
2120
MdLiveAnnouncer,
22-
provide(OVERLAY_CONTAINER_TOKEN, {useValue: createOverlayContainer()}),
21+
{provide: OVERLAY_CONTAINER_TOKEN, useValue: createOverlayContainer()},
2322
HTTP_PROVIDERS,
2423
MdIconRegistry,
2524
Renderer,
26-
provide(HAMMER_GESTURE_CONFIG, {useClass: MdGestureConfig}),
25+
{provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig},
2726
]);

0 commit comments

Comments
 (0)