diff --git a/karma.conf.js b/karma.conf.js index 7654bb92..319afc21 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -15,6 +15,7 @@ module.exports = function (config) { files: [ {pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: false}, {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false}, + {pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: false}, {pattern: './karma-shim.js', watched: false} ], diff --git a/package.json b/package.json index f53eb543..37a61bf0 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,11 @@ "postinstall": "npm run webdriver-update && typings install" }, "dependencies": { - "angular2": "2.0.0-beta.15", + "angular2": "2.0.0-beta.16", "es6-shim": "^0.35.0", "reflect-metadata": "0.1.2", "rxjs": "5.0.0-beta.2", - "zone.js": "0.6.11" + "zone.js": "0.6.12" }, "devDependencies": { "angular-cli": "0.0.*", diff --git a/src/app/components/about/about.spec.ts b/src/app/components/about/about.spec.ts index cdc897bf..81f8648c 100644 --- a/src/app/components/about/about.spec.ts +++ b/src/app/components/about/about.spec.ts @@ -1,7 +1,8 @@ import { it, describe, - injectAsync, + async, + inject, TestComponentBuilder, beforeEachProviders } from 'angular2/testing'; @@ -12,10 +13,10 @@ describe('About Component', () => { beforeEachProviders(() => []); - it('should ...', injectAsync([TestComponentBuilder], (tcb:TestComponentBuilder) => { - return tcb.createAsync(About).then((fixture) => { + it('should ...', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => { + tcb.createAsync(About).then((fixture) => { fixture.detectChanges(); }); - })); + }))); }); diff --git a/src/bootstrap.ts b/src/bootstrap.ts index 952b6594..f5cd75aa 100644 --- a/src/bootstrap.ts +++ b/src/bootstrap.ts @@ -1,6 +1,7 @@ import {enableProdMode, provide} from "angular2/core"; import {bootstrap, ELEMENT_PROBE_PROVIDERS} from 'angular2/platform/browser'; -import {ROUTER_PROVIDERS, HashLocationStrategy, LocationStrategy} from 'angular2/router'; +import {ROUTER_PROVIDERS} from 'angular2/router'; +import {HashLocationStrategy, LocationStrategy} from 'angular2/platform/common'; import {HTTP_PROVIDERS} from 'angular2/http'; const ENV_PROVIDERS = [];