Skip to content

Commit

Permalink
update to Angular 2 beta 16
Browse files Browse the repository at this point in the history
  • Loading branch information
Foxandxss committed Apr 27, 2016
1 parent ee21395 commit 42ed411
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}
],

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.*",
Expand Down
9 changes: 5 additions & 4 deletions src/app/components/about/about.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {
it,
describe,
injectAsync,
async,
inject,
TestComponentBuilder,
beforeEachProviders
} from 'angular2/testing';
Expand All @@ -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();
});
}));
})));

});
3 changes: 2 additions & 1 deletion src/bootstrap.ts
Original file line number Diff line number Diff line change
@@ -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 = [];
Expand Down

0 comments on commit 42ed411

Please sign in to comment.