Update to release beta.16 (mgechev#791)

JohnCashmore · mgechev · commit 04d36af9883f · 2016-04-27T10:58:20.000+03:00
* chore(release): bump version to beta.16

* test(release): update tests in line with new release

* fix(APP_BASE_HREF): update reference to APP_BASE_HREF

* fix(release): async completer removed

not required
diff --git a/package.json b/package.json
@@ -110,13 +110,13 @@
     "yargs": "^4.2.0"
   },
   "dependencies": {
-    "angular2": "2.0.0-beta.15",
+    "angular2": "2.0.0-beta.16",
     "es6-module-loader": "^0.17.8",
     "es6-promise": "^3.1.2",
     "es6-shim": "0.35.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
     "systemjs": "~0.19.25",
-    "zone.js": "^0.6.10"
+    "zone.js": "^0.6.12"
   }
 }
diff --git a/src/client/app/+about/components/about.component.spec.ts b/src/client/app/+about/components/about.component.spec.ts
@@ -2,7 +2,7 @@ import {
   TestComponentBuilder,
   describe,
   expect,
-  injectAsync,
+  inject,
   it
 } from 'angular2/testing';
 import {Component} from 'angular2/core';
@@ -11,16 +11,18 @@ import {AboutComponent} from './about.component';
 
 export function main() {
   describe('About component', () => {
+
+
     it('should work',
-      injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-        return tcb.createAsync(TestComponent)
+      inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        tcb.createAsync(TestComponent)
           .then((rootTC: any) => {
             let aboutDOMEl = rootTC.debugElement.children[0].nativeElement;
 
             expect(DOM.querySelectorAll(aboutDOMEl, 'h2')[0].textContent).toEqual('Features');
           });
-      }));
-  });
+        }));
+    });
 }
 
 @Component({
diff --git a/src/client/app/+home/components/home.component.spec.ts b/src/client/app/+home/components/home.component.spec.ts
@@ -2,8 +2,8 @@ import {
   TestComponentBuilder,
   describe,
   expect,
-  injectAsync,
-  it
+  it,
+  inject
 } from 'angular2/testing';
 import {Component} from 'angular2/core';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
@@ -14,8 +14,8 @@ import {NameListService} from '../../shared/index';
 export function main() {
   describe('Home component', () => {
     it('should work',
-      injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-        return tcb.createAsync(TestComponent)
+      inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        tcb.createAsync(TestComponent)
           .then(rootTC => {
             rootTC.detectChanges();
 
diff --git a/src/client/app/components/app.component.spec.ts b/src/client/app/components/app.component.spec.ts
@@ -2,13 +2,15 @@ import {
   TestComponentBuilder,
   describe,
   expect,
-  injectAsync,
+  inject,
   it,
   beforeEachProviders
 } from 'angular2/testing';
-import {Component, provide, DirectiveResolver} from 'angular2/core';
+import {Component, provide} from 'angular2/core';
+import {DirectiveResolver} from 'angular2/compiler';
 
-import {Location, Router, RouteRegistry, ROUTER_PRIMARY_COMPONENT} from 'angular2/router';
+import {Router, RouteRegistry, ROUTER_PRIMARY_COMPONENT} from 'angular2/router';
+import {Location} from 'angular2/platform/common';
 import {SpyLocation} from 'angular2/src/mock/location_mock';
 import {RootRouter} from 'angular2/src/router/router';
 
@@ -29,8 +31,8 @@ export function main() {
     ]);
 
     it('should work',
-      injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-        return tcb.createAsync(TestComponent)
+      inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        tcb.createAsync(TestComponent)
           .then(rootTC => {
             rootTC.detectChanges();
             let appDOMEl = rootTC.debugElement.children[0].nativeElement;
diff --git a/src/client/main.ts b/src/client/main.ts
@@ -1,6 +1,7 @@
 import {provide, enableProdMode} from 'angular2/core';
 import {bootstrap} from 'angular2/platform/browser';
-import {ROUTER_PROVIDERS, APP_BASE_HREF} from 'angular2/router';
+import {ROUTER_PROVIDERS} from 'angular2/router';
+import {APP_BASE_HREF} from 'angular2/platform/common';
 import {AppComponent} from './app/components/app.component';
 
 if ('<%= ENV %>' === 'prod') { enableProdMode(); }
