refactor(testing): Refactor test_component_builder to remove DOM dependency.

vikerman · mhevery · commit 780606f7ebc7 · 2016-04-28T01:20:01.000-07:00
TestComponentBuilder now uses injected TestComponentRenderer which will be provided by the DOMTestComponentRenderer on platforms that provide some sort of DOM.
diff --git a/modules/@angular/core-testing/browser_static.ts b/modules/@angular/core-testing/browser_static.ts
@@ -46,6 +46,7 @@ export const ADDITIONAL_TEST_BROWSER_PROVIDERS: Array<any /*Type | Provider | an
       {provide: NgZone, useClass: MockNgZone},
       {provide: LocationStrategy, useClass: MockLocationStrategy},
       {provide: AnimationBuilder, useClass: MockAnimationBuilder},
+      {provide: TestComponentRenderer, useClass: DOMTestComponentRenderer},
     ];
 
 /**
diff --git a/modules/@angular/core/testing.ts b/modules/@angular/core/testing.ts
@@ -1,6 +1,7 @@
 export * from './testing/fake_async';
 export * from './testing/lang_utils';
 export * from './testing/logger';
+export * from './testing/regexp';
 export * from './testing/test_component_builder';
 export * from './testing/test_injector';
 export * from './testing/testing';
diff --git a/modules/@angular/core/testing/fake_async.ts b/modules/@angular/core/testing/fake_async.ts
@@ -35,7 +35,7 @@ export function fakeAsync(fn: Function | FunctionWithParamTokens): Function {
     }
     innerTestFn = () => { getTestInjector().execute(fn as FunctionWithParamTokens); };
   } else {
-    innerTestFn = fn;
+    innerTestFn = <Function>fn;
   }
 
   return function(...args) {
diff --git a/modules/@angular/core/testing/test_component_builder.ts b/modules/@angular/core/testing/test_component_builder.ts
@@ -13,10 +13,14 @@ import {DirectiveResolver, ViewResolver} from '@angular/compiler';
 import {Type, isPresent} from '../src/facade/lang';
 import {PromiseWrapper} from '../src/facade/async';
 import {MapWrapper} from '../src/facade/collection';
-import {el} from '../src/utils';
-import {DOCUMENT} from '../.';
-import {getDOM} from '../platform_browser_private';
-import {tick} from '../src/fake_async';
+import {tick} from './fake_async';
+
+/**
+ * An abstract class for inserting the root test component element in a platform independent way.
+ */
+export class TestComponentRenderer {
+  insertRootElement(rootElementId: string) {}
+}
 
 /**
  * Fixture for debugging and testing a component.
@@ -236,16 +240,9 @@ export class TestComponentBuilder {
     this._viewBindingsOverrides.forEach(
         (bindings, type) => mockDirectiveResolver.setViewBindingsOverride(type, bindings));
 
+    var testComponentRenderer: TestComponentRenderer = this._injector.get(TestComponentRenderer);
     var rootElId = `root${_nextRootElementId++}`;
-    var rootEl = el(`<div id="${rootElId}"></div>`);
-    var doc = this._injector.get(DOCUMENT);
-
-    // TODO(juliemr): can/should this be optional?
-    var oldRoots = getDOM().querySelectorAll(doc, '[id^=root]');
-    for (var i = 0; i < oldRoots.length; i++) {
-      getDOM().remove(oldRoots[i]);
-    }
-    getDOM().appendChild(doc.body, rootEl);
+    testComponentRenderer.insertRootElement(rootElId);
 
     var promise: Promise<ComponentRef> =
         this._injector.get(DynamicComponentLoader)
diff --git a/modules/@angular/platform-browser/testing/dom_test_component_renderer.ts b/modules/@angular/platform-browser/testing/dom_test_component_renderer.ts
@@ -0,0 +1,24 @@
+import {Inject, Injectable} from 'angular2/src/core/di';
+import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
+import {DOM} from 'angular2/src/platform/dom/dom_adapter';
+import {TestComponentRenderer} from './test_component_builder';
+import {el} from './utils';
+
+/**
+ * A DOM based implementation of the TestComponentRenderer.
+ */
+@Injectable()
+export class DOMTestComponentRenderer extends TestComponentRenderer {
+  constructor(@Inject(DOCUMENT) private _doc) { super(); }
+
+  insertRootElement(rootElementId: string) {
+    var rootEl = el(`<div id="${rootElementId}"></div>`);
+
+    // TODO(juliemr): can/should this be optional?
+    var oldRoots = DOM.querySelectorAll(this._doc, '[id^=root]');
+    for (var i = 0; i < oldRoots.length; i++) {
+      DOM.remove(oldRoots[i]);
+    }
+    DOM.appendChild(this._doc.body, rootEl);
+  }
+}
diff --git a/modules/@angular/platform-server/testing/server.ts b/modules/@angular/platform-server/testing/server.ts
@@ -86,4 +86,5 @@ export const TEST_SERVER_APPLICATION_PROVIDERS: Array<any /*Type | Provider | an
       {provide: NgZone, useClass: MockNgZone},
       {provide: LocationStrategy, useClass: MockLocationStrategy},
       {provide: AnimationBuilder, useClass: MockAnimationBuilder},
+      {provide: TestComponentRenderer, useClass: DOMTestComponentRenderer}
     ];

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export function fakeAsync(fn: Function \| FunctionWithParamTokens): Function {`
`35`	`35`	`}`
`36`	`36`	`innerTestFn = () => { getTestInjector().execute(fn as FunctionWithParamTokens); };`
`37`	`37`	`} else {`
`38`		`- innerTestFn = fn;`
	`38`	`+ innerTestFn = <Function>fn;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`return function(...args) {`