juliemr · Jun 24, 2016 · Jun 17, 2016
diff --git a/modules/@angular/common/test/directives/ng_class_spec.ts b/modules/@angular/common/test/directives/ng_class_spec.ts
@@ -6,12 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, beforeEachProviders, ddescribe, xdescribe, describe, expect, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
-import {ComponentFixture, TestComponentBuilder} from '@angular/compiler/testing';
-import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
-import {ListWrapper, StringMapWrapper, SetWrapper} from '../../src/facade/collection';
+import {NgClass, NgFor} from '@angular/common';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 import {Component, provide} from '@angular/core';
-import {NgFor, NgClass} from '@angular/common';
+import {ComponentFixture} from '@angular/core/testing';
+import {beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
+
+import {ListWrapper, SetWrapper, StringMapWrapper} from '../../src/facade/collection';
 
 function detectChangesAndCheck(fixture: ComponentFixture<any>, classes: string) {
   fixture.detectChanges();

diff --git a/modules/@angular/common/test/directives/ng_for_spec.ts b/modules/@angular/common/test/directives/ng_for_spec.ts
@@ -8,7 +8,7 @@
 
 import {beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 
 import {ListWrapper} from '../../src/facade/collection';
 import {IS_DART} from '../../src/facade/lang';

diff --git a/modules/@angular/common/test/directives/ng_style_spec.ts b/modules/@angular/common/test/directives/ng_style_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {beforeEach, beforeEachProviders, ddescribe, xdescribe, describe, expect, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
 
 import {StringMapWrapper} from '../../src/facade/collection';

diff --git a/modules/@angular/common/test/directives/ng_switch_spec.ts b/modules/@angular/common/test/directives/ng_switch_spec.ts
@@ -9,7 +9,7 @@
 import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
 import {Component} from '@angular/core';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 
 import {NgSwitch, NgSwitchCase, NgSwitchDefault} from '@angular/common';
 

diff --git a/modules/@angular/common/test/directives/ng_template_outlet_spec.ts b/modules/@angular/common/test/directives/ng_template_outlet_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
 import {Component, Directive, TemplateRef, ContentChildren, QueryList} from '@angular/core';
 import {NgTemplateOutlet} from '@angular/common';

diff --git a/modules/@angular/common/test/directives/non_bindable_spec.ts b/modules/@angular/common/test/directives/non_bindable_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {Component, Directive} from '@angular/core';
 import {ElementRef} from '@angular/core/src/linker/element_ref';

diff --git a/modules/@angular/common/test/forms-deprecated/integration_spec.ts b/modules/@angular/common/test/forms-deprecated/integration_spec.ts
@@ -9,10 +9,9 @@
 import {NgFor, NgIf} from '@angular/common';
 import {Control, ControlGroup, ControlValueAccessor, FORM_DIRECTIVES, FORM_PROVIDERS, NG_ASYNC_VALIDATORS, NG_VALIDATORS, NgControl, NgForm, RadioButtonState, Validator, Validators} from '@angular/common/src/forms-deprecated';
 import {TestComponentBuilder} from '@angular/compiler/testing';
-import {ComponentFixture} from '@angular/compiler/testing';
 import {Component, Directive, EventEmitter, Output} from '@angular/core';
 import {Input, Provider, forwardRef} from '@angular/core';
-import {fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
+import {ComponentFixture, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
 import {afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
 import {By} from '@angular/platform-browser/src/dom/debug/by';

diff --git a/modules/@angular/common/test/pipes/slice_pipe_spec.ts b/modules/@angular/common/test/pipes/slice_pipe_spec.ts
@@ -7,10 +7,9 @@
  */
 
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach, inject,} from '@angular/core/testing/testing_internal';
-import {} from '@angular/core/testing/testing_internal';
-import {browserDetection} from '@angular/platform-browser/testing/browser_util';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
+import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 
 import {Component} from '@angular/core';
 import {SlicePipe} from '@angular/common';

diff --git a/modules/@angular/compiler/testing/test_component_builder.ts b/modules/@angular/compiler/testing/test_component_builder.ts
@@ -7,14 +7,19 @@
  */
 
 import {AnimationEntryMetadata, ChangeDetectorRef, ComponentFactory, ComponentRef, ComponentResolver, DebugElement, ElementRef, Injectable, Injector, NgZone, NgZoneError, OpaqueToken, ViewMetadata, getDebugNode} from '@angular/core';
-import {tick} from '@angular/core/testing';
+import {ComponentFixture, tick} from '@angular/core/testing';
 
 import {DirectiveResolver, ViewResolver} from '../index';
 import {ObservableWrapper, PromiseCompleter, PromiseWrapper} from '../src/facade/async';
 import {ListWrapper, MapWrapper} from '../src/facade/collection';
 import {BaseException} from '../src/facade/exceptions';
 import {IS_DART, Type, isBlank, isPresent, scheduleMicroTask} from '../src/facade/lang';
 
+/**
+ *  @deprecated
+ *  Import ComponentFixture from @angular/core/testing instead.
+ */
+export {ComponentFixture} from '@angular/core/testing';
 /**
  * An abstract class for inserting the root test component element in a platform independent way.
  */
@@ -25,180 +30,6 @@ export class TestComponentRenderer {
 export var ComponentFixtureAutoDetect = new OpaqueToken('ComponentFixtureAutoDetect');
 export var ComponentFixtureNoNgZone = new OpaqueToken('ComponentFixtureNoNgZone');
 
-/**
- * Fixture for debugging and testing a component.
- */
-export class ComponentFixture<T> {
-  /**
-   * The DebugElement associated with the root element of this component.
-   */
-  debugElement: DebugElement;
-
-  /**
-   * The instance of the root component class.
-   */
-  componentInstance: any;
-
-  /**
-   * The native element at the root of the component.
-   */
-  nativeElement: any;
-
-  /**
-   * The ElementRef for the element at the root of the component.
-   */
-  elementRef: ElementRef;
-
-  /**
-   * The ComponentRef for the component
-   */
-  componentRef: ComponentRef<T>;
-
-  /**
-   * The ChangeDetectorRef for the component
-   */
-  changeDetectorRef: ChangeDetectorRef;
-
-  /**
-   * The NgZone in which this component was instantiated.
-   */
-  ngZone: NgZone;
-
-  private _autoDetect: boolean;
-
-  private _isStable: boolean = true;
-  private _completer: PromiseCompleter<any> = null;
-  private _onUnstableSubscription: any /** TODO #9100 */ = null;
-  private _onStableSubscription: any /** TODO #9100 */ = null;
-  private _onMicrotaskEmptySubscription: any /** TODO #9100 */ = null;
-  private _onErrorSubscription: any /** TODO #9100 */ = null;
-
-  constructor(componentRef: ComponentRef<T>, ngZone: NgZone, autoDetect: boolean) {
-    this.changeDetectorRef = componentRef.changeDetectorRef;
-    this.elementRef = componentRef.location;
-    this.debugElement = <DebugElement>getDebugNode(this.elementRef.nativeElement);
-    this.componentInstance = componentRef.instance;
-    this.nativeElement = this.elementRef.nativeElement;
-    this.componentRef = componentRef;
-    this.ngZone = ngZone;
-    this._autoDetect = autoDetect;
-
-    if (ngZone != null) {
-      this._onUnstableSubscription =
-          ObservableWrapper.subscribe(ngZone.onUnstable, (_) => { this._isStable = false; });
-      this._onMicrotaskEmptySubscription =
-          ObservableWrapper.subscribe(ngZone.onMicrotaskEmpty, (_) => {
-            if (this._autoDetect) {
-              // Do a change detection run with checkNoChanges set to true to check
-              // there are no changes on the second run.
-              this.detectChanges(true);
-            }
-          });
-      this._onStableSubscription = ObservableWrapper.subscribe(ngZone.onStable, (_) => {
-        this._isStable = true;
-        // Check whether there are no pending macrotasks in a microtask so that ngZone gets a chance
-        // to update the state of pending macrotasks.
-        scheduleMicroTask(() => {
-          if (!this.ngZone.hasPendingMacrotasks) {
-            if (this._completer != null) {
-              this._completer.resolve(true);
-              this._completer = null;
-            }
-          }
-        });
-      });
-
-      this._onErrorSubscription = ObservableWrapper.subscribe(
-          ngZone.onError, (error: NgZoneError) => { throw error.error; });
-    }
-  }
-
-  private _tick(checkNoChanges: boolean) {
-    this.changeDetectorRef.detectChanges();
-    if (checkNoChanges) {
-      this.checkNoChanges();
-    }
-  }
-
-  /**
-   * Trigger a change detection cycle for the component.
-   */
-  detectChanges(checkNoChanges: boolean = true): void {
-    if (this.ngZone != null) {
-      // Run the change detection inside the NgZone so that any async tasks as part of the change
-      // detection are captured by the zone and can be waited for in isStable.
-      this.ngZone.run(() => { this._tick(checkNoChanges); });
-    } else {
-      // Running without zone. Just do the change detection.
-      this._tick(checkNoChanges);
-    }
-  }
-
-  /**
-   * Do a change detection run to make sure there were no changes.
-   */
-  checkNoChanges(): void { this.changeDetectorRef.checkNoChanges(); }
-
-  /**
-   * Set whether the fixture should autodetect changes.
-   *
-   * Also runs detectChanges once so that any existing change is detected.
-   */
-  autoDetectChanges(autoDetect: boolean = true) {
-    if (this.ngZone == null) {
-      throw new BaseException('Cannot call autoDetectChanges when ComponentFixtureNoNgZone is set');
-    }
-    this._autoDetect = autoDetect;
-    this.detectChanges();
-  }
-
-  /**
-   * Return whether the fixture is currently stable or has async tasks that have not been completed
-   * yet.
-   */
-  isStable(): boolean { return this._isStable && !this.ngZone.hasPendingMacrotasks; }
-
-  /**
-   * Get a promise that resolves when the fixture is stable.
-   *
-   * This can be used to resume testing after events have triggered asynchronous activity or
-   * asynchronous change detection.
-   */
-  whenStable(): Promise<any> {
-    if (this.isStable()) {
-      return PromiseWrapper.resolve(false);
-    } else if (this._completer !== null) {
-      return this._completer.promise;
-    } else {
-      this._completer = new PromiseCompleter<any>();
-      return this._completer.promise;
-    }
-  }
-
-  /**
-   * Trigger component destruction.
-   */
-  destroy(): void {
-    this.componentRef.destroy();
-    if (this._onUnstableSubscription != null) {
-      ObservableWrapper.dispose(this._onUnstableSubscription);
-      this._onUnstableSubscription = null;
-    }
-    if (this._onStableSubscription != null) {
-      ObservableWrapper.dispose(this._onStableSubscription);
-      this._onStableSubscription = null;
-    }
-    if (this._onMicrotaskEmptySubscription != null) {
-      ObservableWrapper.dispose(this._onMicrotaskEmptySubscription);
-      this._onMicrotaskEmptySubscription = null;
-    }
-    if (this._onErrorSubscription != null) {
-      ObservableWrapper.dispose(this._onErrorSubscription);
-      this._onErrorSubscription = null;
-    }
-  }
-}
-
 var _nextRootElementId = 0;
 
 /**

diff --git a/modules/@angular/core/test/linker/change_detection_integration_spec.ts b/modules/@angular/core/test/linker/change_detection_integration_spec.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {TestComponentBuilder} from '@angular/compiler/testing';
+import {ComponentFixture, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
 import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {fakeAsync, flushMicrotasks, tick,} from '@angular/core/testing';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
-
 import {isBlank, NumberWrapper,} from '../../src/facade/lang';
 import {BaseException} from '../../src/facade/exceptions';
 import {StringMapWrapper} from '../../src/facade/collection';

diff --git a/modules/@angular/core/test/linker/dynamic_component_loader_spec.ts b/modules/@angular/core/test/linker/dynamic_component_loader_spec.ts
@@ -8,7 +8,8 @@
 
 import {beforeEach, ddescribe, xdescribe, describe, expect, iit, inject, beforeEachProviders, it, xit,} from '@angular/core/testing/testing_internal';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {ComponentFixture} from '@angular/core/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 import {Predicate} from '../../src/facade/collection';
 import {Injector, OnDestroy, DebugElement, Type, ViewContainerRef, ViewChild} from '@angular/core';
 import {Component, ViewMetadata} from '@angular/core/src/metadata';

diff --git a/modules/@angular/core/test/linker/integration_spec.ts b/modules/@angular/core/test/linker/integration_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {beforeEach, ddescribe, xdescribe, describe, expect, iit, inject, beforeEachProviders, it, xit,} from '@angular/core/testing/testing_internal';
-import {fakeAsync, tick} from '@angular/core/testing';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {fakeAsync, tick, ComponentFixture} from '@angular/core/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {isPresent, stringify, isBlank,} from '../../src/facade/lang';

diff --git a/modules/@angular/core/test/linker/projection_integration_spec.ts b/modules/@angular/core/test/linker/projection_integration_spec.ts
@@ -8,7 +8,8 @@
 
 import {beforeEach, ddescribe, xdescribe, describe, expect, iit, inject, beforeEachProviders, it, xit,} from '@angular/core/testing/testing_internal';
 import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {ComponentFixture} from '@angular/core/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 

diff --git a/modules/@angular/core/test/linker/view_injector_integration_spec.ts b/modules/@angular/core/test/linker/view_injector_integration_spec.ts
@@ -7,8 +7,8 @@
  */
 
 import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach, beforeEachProviders, inject,} from '@angular/core/testing/testing_internal';
-import {fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
-import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
+import {fakeAsync, flushMicrotasks, tick, ComponentFixture} from '@angular/core/testing';
+import {TestComponentBuilder} from '@angular/compiler/testing';
 import {isBlank} from '../../src/facade/lang';
 import {Type, ViewContainerRef, TemplateRef, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, Directive, Component, DebugElement, forwardRef, Input, PipeTransform, Attribute, ViewMetadata, provide, Optional, Inject, Self, InjectMetadata, Pipe, Host, SkipSelfMetadata} from '@angular/core';
 import {NgIf, NgFor} from '@angular/common';

diff --git a/modules/@angular/core/testing.ts b/modules/@angular/core/testing.ts
@@ -7,6 +7,7 @@
  */
 
 export * from './testing/async';
+export * from './testing/component_fixture';
 export * from './testing/fake_async';
 export * from './testing/test_injector';
 export * from './testing/testing';