Skip to content

Commit bf3573e

Browse files
committed
chore: update to beta.16
Close #532
1 parent 8ae3cb6 commit bf3573e

File tree

8 files changed

+22
-21
lines changed

8 files changed

+22
-21
lines changed

addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import {
2+
async,
23
beforeEachProviders,
34
describe,
45
ddescribe,
56
expect,
67
iit,
78
it,
89
inject,
9-
injectAsync,
1010
ComponentFixture,
1111
TestComponentBuilder
1212
} from 'angular2/testing';
@@ -30,10 +30,10 @@ describe('<%= classifiedModuleName %> Component', () => {
3030
<% } else { %>
3131
beforeEachProviders((): any[] => []);
3232
<% } %>
33-
it('should ...', injectAsync([TestComponentBuilder], (tcb:TestComponentBuilder) => {
33+
it('should ...', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => {
3434
return tcb.createAsync(<%= classifiedModuleName %>Component).then((fixture: ComponentFixture) => {
3535
fixture.detectChanges();
3636
});
37-
}));
37+
})));
3838

3939
});

addon/ng2/blueprints/component/files/__path__/__name__.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS} from 'angular2/router'
1818
export class <%= classifiedModuleName %>Component implements OnInit {
1919

2020
constructor() {}
21-
21+
2222
ngOnInit() {
2323
}
2424

addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import {
2+
async,
23
beforeEachProviders,
34
describe,
45
ddescribe,
56
expect,
67
iit,
78
it,
89
inject,
9-
injectAsync,
1010
ComponentFixture,
1111
TestComponentBuilder
1212
} from 'angular2/testing';
@@ -24,10 +24,10 @@ describe('<%= classifiedModuleName %> Directive', () => {
2424
beforeEachProviders((): any[] => []);
2525

2626

27-
it('should ...', injectAsync([TestComponentBuilder], (tcb:TestComponentBuilder) => {
27+
it('should ...', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => {
2828
return tcb.createAsync(TestComponent).then((fixture: ComponentFixture) => {
2929
fixture.detectChanges();
3030
});
31-
}));
31+
})));
3232

3333
});

addon/ng2/blueprints/ng2/files/karma.conf.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ module.exports = function (config) {
1818
{ pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true },
1919
{ pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: true },
2020
{ pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: true },
21+
{ pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: true },
22+
{ pattern: 'node_modules/zone.js/dist/fake-async-test.js', included: true, watched: true },
2123
{ pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: true },
2224
{ pattern: 'node_modules/angular2/bundles/angular2.js', included: true, watched: true },
2325
{ pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: true },

addon/ng2/blueprints/ng2/files/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"angular2": "2.0.0-beta.15",
16+
"angular2": "2.0.0-beta.16",
1717
"es6-shim": "^0.35.0",
1818
"reflect-metadata": "0.1.2",
1919
"rxjs": "5.0.0-beta.2",
2020
"systemjs": "0.19.20",
21-
"zone.js": "^0.6.11"
21+
"zone.js": "^0.6.12"
2222
},
2323
"devDependencies": {
2424
"angular-cli": "0.0.*",
2525
"clang-format": "^1.0.35",
2626
"codelyzer": "0.0.14",
2727
"ember-cli-inject-live-reload": "^1.4.0",
28-
"jasmine-core": "^2.3.4",
28+
"jasmine-core": "^2.4.1",
2929
"jasmine-spec-reporter": "^2.4.0",
3030
"karma": "^0.13.15",
31-
"karma-chrome-launcher": "^0.2.1",
32-
"karma-jasmine": "^0.3.6",
33-
"protractor": "^3.0.0",
31+
"karma-chrome-launcher": "^0.2.3",
32+
"karma-jasmine": "^0.3.8",
33+
"protractor": "^3.3.0",
3434
"ts-node": "^0.5.5",
3535
"tslint": "^3.6.0",
36-
"typescript": "^1.8.7",
37-
"typings": "^0.7.12"
36+
"typescript": "^1.8.10",
37+
"typings": "^0.8.1"
3838
}
3939
}

addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
ddescribe,
66
expect,
77
inject,
8-
injectAsync,
98
TestComponentBuilder,
109
beforeEachProviders
1110
} from 'angular2/testing';

addon/ng2/blueprints/route/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ module.exports = {
129129

130130
normalizeEntityName: function (entityName) {
131131
var parsedPath = dynamicPathParser(this.project, entityName);
132-
132+
133133
// If a specified route starts with `+` remove it as it'd break convention.
134134
if (parsedPath.name[0] === '+') {
135135
var index = entityName.lastIndexOf(parsedPath.name);
136136
entityName = entityName.substr(0, index) + entityName.substr(index + 1);
137137
}
138-
138+
139139
this.dynamicPath = parsedPath;
140140

141141
//leave the entity name intact for component generation

addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import {
2+
async,
23
beforeEachProviders,
34
it,
45
iit,
56
describe,
67
ddescribe,
78
expect,
8-
inject,
9-
injectAsync
9+
inject
1010
} from 'angular2/testing';
1111
import {provide} from 'angular2/core';
1212
import {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>.service';
1313

1414
describe('<%= classifiedModuleName %> Service', () => {
1515

1616
beforeEachProviders(() => [<%= classifiedModuleName %>Service]);
17-
17+
1818
it('should ...', inject([<%= classifiedModuleName %>Service], (service: <%= classifiedModuleName %>Service) => {
1919

2020
}));

0 commit comments

Comments
 (0)