diff --git a/modules/angular2/src/testing/test_component_builder.ts b/modules/angular2/src/testing/test_component_builder.ts index 3c2c6aac34..b37b541090 100644 --- a/modules/angular2/src/testing/test_component_builder.ts +++ b/modules/angular2/src/testing/test_component_builder.ts @@ -22,14 +22,14 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {DebugElement, DebugElement_} from 'angular2/src/core/debug/debug_element'; -export abstract class RootTestComponent { +export abstract class ComponentFixture { debugElement: DebugElement; abstract detectChanges(): void; abstract destroy(): void; } -export class RootTestComponent_ extends RootTestComponent { +export class ComponentFixture_ extends ComponentFixture { /** @internal */ _componentRef: ComponentRef; /** @internal */ @@ -53,7 +53,7 @@ export class RootTestComponent_ extends RootTestComponent { var _nextRootElementId = 0; /** - * Builds a RootTestComponent for use in component level tests. + * Builds a ComponentFixture for use in component level tests. */ @Injectable() export class TestComponentBuilder { @@ -186,11 +186,11 @@ export class TestComponentBuilder { } /** - * Builds and returns a RootTestComponent. + * Builds and returns a ComponentFixture. * - * @return {Promise} + * @return {Promise} */ - createAsync(rootComponentType: Type): Promise { + createAsync(rootComponentType: Type): Promise { var mockDirectiveResolver = this._injector.get(DirectiveResolver); var mockViewResolver = this._injector.get(ViewResolver); this._viewOverrides.forEach((view, type) => mockViewResolver.setView(type, view)); @@ -220,6 +220,6 @@ export class TestComponentBuilder { return this._injector.get(DynamicComponentLoader) .loadAsRoot(rootComponentType, `#${rootElId}`, this._injector) - .then((componentRef) => { return new RootTestComponent_(componentRef); }); + .then((componentRef) => { return new ComponentFixture_(componentRef); }); } } diff --git a/modules/angular2/test/core/debug/debug_element_spec.ts b/modules/angular2/test/core/debug/debug_element_spec.ts index cc69f725a4..e20f928fe3 100644 --- a/modules/angular2/test/core/debug/debug_element_spec.ts +++ b/modules/angular2/test/core/debug/debug_element_spec.ts @@ -137,14 +137,14 @@ export function main() { inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { tcb.createAsync(ParentComp) - .then((rootTestComponent) => { - rootTestComponent.detectChanges(); + .then((componentFixture) => { + componentFixture.detectChanges(); - var childEls = rootTestComponent.debugElement.children; + var childEls = componentFixture.debugElement.children; // The root is a lone component, and has no children in the light dom. expect(childEls.length).toEqual(0); - var rootCompChildren = rootTestComponent.debugElement.componentViewChildren; + var rootCompChildren = componentFixture.debugElement.componentViewChildren; // The root component has 4 elements in its shadow view. expect(rootCompChildren.length).toEqual(4); expect(DOM.hasClass(rootCompChildren[0].nativeElement, 'parent')).toBe(true); @@ -185,10 +185,10 @@ export function main() { it('should list child elements within viewports', inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { - tcb.createAsync(UsingFor).then((rootTestComponent) => { - rootTestComponent.detectChanges(); + tcb.createAsync(UsingFor).then((componentFixture) => { + componentFixture.detectChanges(); - var childEls = rootTestComponent.debugElement.componentViewChildren; + var childEls = componentFixture.debugElement.componentViewChildren; // TODO should this count include the