From df20a288353cce494bf6bed152cb0891ffafdaa4 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Fri, 12 Aug 2016 16:24:12 -0700 Subject: [PATCH] chore(tooltip): remove TestComponentBuilder (#1023) --- src/components/tooltip/tooltip.spec.ts | 39 ++++++++------------------ 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/src/components/tooltip/tooltip.spec.ts b/src/components/tooltip/tooltip.spec.ts index 9863f148880..ccb4be3255e 100644 --- a/src/components/tooltip/tooltip.spec.ts +++ b/src/components/tooltip/tooltip.spec.ts @@ -1,11 +1,4 @@ -import { - inject, - async, - addProviders, - TestComponentBuilder, - ComponentFixture, - TestBed, -} from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; import {TooltipPosition, MdTooltip} from '@angular2-material/tooltip/tooltip'; @@ -14,29 +7,23 @@ import {MdTooltipModule} from './tooltip'; describe('MdTooltip', () => { - let builder: TestComponentBuilder; let overlayContainerElement: HTMLElement; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdTooltipModule], declarations: [BasicTooltipDemo], + providers: [ + {provide: OverlayContainer, useFactory: () => { + overlayContainerElement = document.createElement('div'); + return {getContainerElement: () => overlayContainerElement}; + }} + ] }); - addProviders([ - {provide: OverlayContainer, useFactory: () => { - overlayContainerElement = document.createElement('div'); - return {getContainerElement: () => overlayContainerElement}; - }} - ]); - TestBed.compileComponents(); })); - beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { - builder = tcb; - })); - describe('basic usage', () => { let fixture: ComponentFixture; let buttonDebugElement: DebugElement; @@ -44,13 +31,11 @@ describe('MdTooltip', () => { let tooltipDirective: MdTooltip; beforeEach(async(() => { - builder.createAsync(BasicTooltipDemo).then(f => { - fixture = f; - fixture.detectChanges(); - buttonDebugElement = fixture.debugElement.query(By.css('button')); - buttonElement = buttonDebugElement.nativeElement; - tooltipDirective = buttonDebugElement.injector.get(MdTooltip); - }); + fixture = TestBed.createComponent(BasicTooltipDemo); + fixture.detectChanges(); + buttonDebugElement = fixture.debugElement.query(By.css('button')); + buttonElement = buttonDebugElement.nativeElement; + tooltipDirective = buttonDebugElement.injector.get(MdTooltip); })); it('should show/hide on mouse enter/leave', async(() => {