WIP: testing

robwormald · robwormald · commit 039b7e729b43 · 2016-04-26T18:00:56.000-07:00
diff --git a/karma-js.conf.js b/karma-js.conf.js
@@ -11,7 +11,8 @@ module.exports = function(config) {
     files: [
       // Sources and specs.
       // Loaded through the System loader, in `test-main.js`.
-      {pattern: 'dist/@angular/**/*.js', included: false, watched: false},
+      {pattern: 'dist/@angular/**/*.js', included: false, watched: true},
+      {pattern: 'dist/@angular/**/*.js.map', included: false, watched: false},
 
       'node_modules/es6-shim/es6-shim.js',
       // include Angular v1 for upgrade module testing
@@ -30,7 +31,8 @@ module.exports = function(config) {
       'node_modules/reflect-metadata/Reflect.js',
       'tools/build/file2modulename.js',
       'test-main.js',
-      {pattern: 'modules/@angular/testing/test/static_assets/**', included: false, watched: false}
+      {pattern: 'modules/@angular/testing/test/static_assets/**', included: false, watched: false},
+      {pattern: 'modules/@angular/platform-browser/static_assets/**', included: false, watched: false}
     ],
 
     exclude: ['dist/@angular/**/e2e_test/**', 'dist/@angular/examples/**', 'dist/angular1_router.js', 'dist/@angular/testing/src/e2e_util.js'],
diff --git a/modules/@angular/platform-browser-dynamic/platform_browser_dynamic.ts b/modules/@angular/platform-browser-dynamic/platform_browser_dynamic.ts
@@ -5,7 +5,7 @@ import {isPresent} from '@angular/facade';
 import {XHRImpl} from './src/xhr/xhr_impl';
 import {BROWSER_APP_COMMON_PROVIDERS, browserPlatform} from '@angular/platform-browser';
 import {reflector, ReflectiveInjector, coreLoadAndBootstrap} from '@angular/core';
-import {DOM} from './platform_browser_private';
+import {getDOM} from './platform_browser_private';
 import {ReflectionCapabilities} from './core_private';
 
 export const CACHED_TEMPLATE_PROVIDER: Array<any /*Type | Provider | any[]*/> =
@@ -92,7 +92,7 @@ export const BROWSER_APP_PROVIDERS: Array<any /*Type | Provider | any[]*/> = /*@
 export function bootstrap(
   appComponentType: Type,
   customProviders?: Array<any /*Type | Provider | any[]*/>): Promise<ComponentRef> {
-  DOM.xhrType = XHRImpl;
+  getDOM().xhrType = XHRImpl;
   reflector.reflectionCapabilities = new ReflectionCapabilities();
   var appInjector = ReflectiveInjector.resolveAndCreate(
     [BROWSER_APP_PROVIDERS, isPresent(customProviders) ? customProviders : []],
diff --git a/modules/@angular/platform-browser-dynamic/platform_browser_private.ts b/modules/@angular/platform-browser-dynamic/platform_browser_private.ts
@@ -1,4 +1,4 @@
 import {__platform_browser_private__ as _} from '@angular/platform-browser';
 
 export type DomAdapter = _.DomAdapter;
-export var DOM: _.DomAdapter = _.DOM;
+export function getDOM(): _.DomAdapter { return _.getDOM() };
diff --git a/modules/@angular/platform-browser-dynamic/test/xhr/xhr_impl_spec.ts b/modules/@angular/platform-browser-dynamic/test/xhr/xhr_impl_spec.ts
@@ -24,7 +24,7 @@ export function main() {
     // static_assets/200.html.
     // We currently have no way of detecting this.
     var urlBase = IS_DART ? '' : '/base/modules/@angular/';
-    var url200 = urlBase + 'platform-browser/static_assets/200.html';
+    var url200 = urlBase + 'platform-browser-dynamic/static_assets/200.html';
     var url404 = '/bad/path/404.html';
 
     beforeEach(() => { xhr = new XHRImpl(); });
diff --git a/modules/@angular/testing/browser.ts b/modules/@angular/testing/browser.ts
@@ -2,7 +2,7 @@ import {
   TEST_BROWSER_STATIC_PLATFORM_PROVIDERS,
   ADDITIONAL_TEST_BROWSER_PROVIDERS
 } from './browser_static';
-import {BROWSER_APP_PROVIDERS} from '@angular/platform-browser';
+import {BROWSER_APP_PROVIDERS} from '@angular/platform-browser-dynamic';
 
 
 /**
diff --git a/test-main.js b/test-main.js
@@ -40,6 +40,9 @@ System.config({
     '@angular/platform-browser': {
       main: 'index'
     },
+    '@angular/platform-browser-dynamic': {
+      main: 'index'
+    },
     // '@angular/platform-browser/testing': {
     //   main: 'index'
     // }
@@ -71,7 +74,6 @@ System.import('@angular/testing').then(function(testing) {
 .then(function() {
   __karma__.start();
 }, function(error) {
-  console.log(error)
   __karma__.error(error.stack || error);
 });
 
