X Tutup
Skip to content

Commit ad99199

Browse files
juliemrjelbourn
authored andcommitted
chore(test): remove deprecated RootTestComponent
Uses of `RootTestComponent` should be migrated to `ComponentFixture`.
1 parent c7242a3 commit ad99199

File tree

7 files changed

+13
-20
lines changed

7 files changed

+13
-20
lines changed

modules/angular2/src/testing/test_component_builder.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,16 @@ import {DebugElement, DebugElement_} from 'angular2/src/core/debug/debug_element
2424

2525

2626
/**
27-
* @deprecated Use ComponentFixture
27+
* Fixture for debugging and testing a component.
2828
*/
29-
export abstract class RootTestComponent {
29+
export abstract class ComponentFixture {
3030
debugElement: DebugElement;
3131

3232
abstract detectChanges(): void;
3333
abstract destroy(): void;
3434
}
3535

3636

37-
export abstract class ComponentFixture extends RootTestComponent {}
38-
39-
4037
export class ComponentFixture_ extends ComponentFixture {
4138
/** @internal */
4239
_componentRef: ComponentRef;

modules/angular2/test/router/integration/auxiliary_route_spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
RootTestComponent,
2+
ComponentFixture,
33
AsyncTestCompleter,
44
TestComponentBuilder,
55
beforeEach,
@@ -22,7 +22,7 @@ import {RouteConfig, Route, AuxRoute, Redirect} from 'angular2/src/router/route_
2222

2323
import {TEST_ROUTER_PROVIDERS, RootCmp, compile, clickOnElement, getHref} from './util';
2424

25-
function getLinkElement(rtc: RootTestComponent) {
25+
function getLinkElement(rtc: ComponentFixture) {
2626
return rtc.debugElement.componentViewChildren[0].nativeElement;
2727
}
2828

@@ -33,7 +33,7 @@ export function main() {
3333
describe('auxiliary routes', () => {
3434

3535
var tcb: TestComponentBuilder;
36-
var fixture: RootTestComponent;
36+
var fixture: ComponentFixture;
3737
var rtr;
3838

3939
beforeEachProviders(() => TEST_ROUTER_PROVIDERS);

modules/angular2/test/router/integration/impl/async_route_spec_impl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
inject,
99
it,
1010
TestComponentBuilder,
11-
RootTestComponent,
11+
ComponentFixture,
1212
xit,
1313
} from 'angular2/testing_internal';
1414

@@ -32,7 +32,7 @@ import {
3232
asyncRouteDataCmp
3333
} from './fixture_components';
3434

35-
function getLinkElement(rtc: RootTestComponent) {
35+
function getLinkElement(rtc: ComponentFixture) {
3636
return rtc.debugElement.componentViewChildren[0].nativeElement;
3737
}
3838

modules/angular2/test/router/integration/impl/sync_route_spec_impl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
inject,
99
it,
1010
TestComponentBuilder,
11-
RootTestComponent,
11+
ComponentFixture,
1212
xit,
1313
} from 'angular2/testing_internal';
1414

@@ -19,7 +19,7 @@ import {Router, Route, Location} from 'angular2/router';
1919
import {HelloCmp, UserCmp, TeamCmp, ParentCmp, ParentWithDefaultCmp} from './fixture_components';
2020

2121

22-
function getLinkElement(rtc: RootTestComponent) {
22+
function getLinkElement(rtc: ComponentFixture) {
2323
return rtc.debugElement.componentViewChildren[0].nativeElement;
2424
}
2525

modules/angular2/test/router/integration/redirect_route_spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
RootTestComponent,
2+
ComponentFixture,
33
AsyncTestCompleter,
44
TestComponentBuilder,
55
beforeEach,
@@ -34,7 +34,7 @@ export function main() {
3434
describe('redirects', () => {
3535

3636
var tcb: TestComponentBuilder;
37-
var rootTC: RootTestComponent;
37+
var rootTC: ComponentFixture;
3838
var rtr;
3939

4040
beforeEachProviders(() => TEST_ROUTER_PROVIDERS);

modules/angular2/test/router/integration/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {Type, isBlank} from 'angular2/src/facade/lang';
33
import {BaseException} from 'angular2/src/facade/exceptions';
44

55
import {
6-
RootTestComponent,
6+
ComponentFixture,
77
AsyncTestCompleter,
88
TestComponentBuilder,
99
beforeEach,

modules/angular2/testing.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
*
88
*/
99
export * from './src/testing/testing';
10-
export {
11-
ComponentFixture,
12-
RootTestComponent,
13-
TestComponentBuilder
14-
} from './src/testing/test_component_builder';
10+
export {ComponentFixture, TestComponentBuilder} from './src/testing/test_component_builder';
1511
export * from './src/testing/test_injector';
1612
export * from './src/testing/fake_async';
1713

0 commit comments

Comments
 (0)
X Tutup