Skip to content

Commit

Permalink
feat(): Migrated on Angular 2.0.0-beta.17
Browse files Browse the repository at this point in the history
  • Loading branch information
akserg committed May 3, 2016
1 parent fc949d9 commit 894ec35
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = function(config) {
'node_modules/zone.js/dist/zone.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/jasmine-patch.js',
'node_modules/zone.js/dist/fake-async-test.js',
'node_modules/systemjs/dist/system.src.js',
'node_modules/reflect-metadata/Reflect.js',

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"typings": "./ng2-slim-loading-bar.d.ts",
"homepage": "https://github.com/akserg/ng2-slim-loading-bar",
"devDependencies": {
"angular2": "~2.0.0-beta.14",
"angular2": "~2.0.0-beta.17",
"commitizen": "^2.7.6",
"cz-conventional-changelog": "^1.1.5",
"es6-promise": "~3.1.2",
Expand All @@ -41,15 +41,15 @@
"karma-jasmine": "~0.3.6",
"karma-typescript-preprocessor": "0.0.21",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
"rxjs": "5.0.0-beta.6",
"semantic-release": "^4.3.5",
"systemjs": "~0.19.6",
"systemjs-builder": "^0.15.6",
"tsd": "^0.6.5",
"typescript": "~1.7.3",
"typings": "^0.6.8",
"uglify-js": "^2.6.2",
"zone.js": "~0.6.6"
"zone.js": "~0.6.12"
},
"config": {
"commitizen": {
Expand Down
7 changes: 4 additions & 3 deletions tests/component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
beforeEach,
it,
inject,
injectAsync,
// injectAsync,
beforeEachProviders,
TestComponentBuilder,
ComponentFixture,
Expand Down Expand Up @@ -32,10 +32,11 @@ export function main() {
return [TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS, TestComponentBuilder, SlimLoadingBarService];
});

beforeEach(injectAsync([TestComponentBuilder], (tcb:TestComponentBuilder) => {
// beforeEach(injectAsync([TestComponentBuilder], (tcb:TestComponentBuilder) => {
beforeEach(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => {
return tcb.createAsync(SlimLoadingBar).then((cf:ComponentFixture) => {
componentFixture = cf;
let element = componentFixture.nativeElement;
let element = componentFixture.elementRef.nativeElement;
containerDiv = element.querySelector('.slim-loading-bar');
progressDiv = element.querySelector('.slim-loading-bar-progress');
component = componentFixture.componentInstance;
Expand Down

0 comments on commit 894ec35

Please sign in to comment.