From bf3573e43f09c65ef1eadee181d1c4232490035a Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Tue, 26 Apr 2016 17:36:48 +0100 Subject: [PATCH] chore: update to beta.16 Close #532 --- .../files/__path__/__name__.component.spec.ts | 6 +++--- .../files/__path__/__name__.component.ts | 2 +- .../files/__path__/__name__.directive.spec.ts | 6 +++--- addon/ng2/blueprints/ng2/files/karma.conf.js | 2 ++ addon/ng2/blueprints/ng2/files/package.json | 16 ++++++++-------- .../pipe/files/__path__/__name__.pipe.spec.ts | 1 - addon/ng2/blueprints/route/index.js | 4 ++-- .../files/__path__/__name__.service.spec.ts | 6 +++--- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts index cc3ad0204a9a..20f60ef60ea5 100644 --- a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts +++ b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts @@ -1,4 +1,5 @@ import { + async, beforeEachProviders, describe, ddescribe, @@ -6,7 +7,6 @@ import { iit, it, inject, - injectAsync, ComponentFixture, TestComponentBuilder } from 'angular2/testing'; @@ -30,10 +30,10 @@ describe('<%= classifiedModuleName %> Component', () => { <% } else { %> beforeEachProviders((): any[] => []); <% } %> - it('should ...', injectAsync([TestComponentBuilder], (tcb:TestComponentBuilder) => { + it('should ...', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => { return tcb.createAsync(<%= classifiedModuleName %>Component).then((fixture: ComponentFixture) => { fixture.detectChanges(); }); - })); + }))); }); diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.ts index fc11775cadbc..ba7b0923eb39 100644 --- a/addon/ng2/blueprints/component/files/__path__/__name__.component.ts +++ b/addon/ng2/blueprints/component/files/__path__/__name__.component.ts @@ -18,7 +18,7 @@ import {RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS} from 'angular2/router' export class <%= classifiedModuleName %>Component implements OnInit { constructor() {} - + ngOnInit() { } diff --git a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts index 4eda3ec3309a..3778644742d5 100644 --- a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts +++ b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts @@ -1,4 +1,5 @@ import { + async, beforeEachProviders, describe, ddescribe, @@ -6,7 +7,6 @@ import { iit, it, inject, - injectAsync, ComponentFixture, TestComponentBuilder } from 'angular2/testing'; @@ -24,10 +24,10 @@ describe('<%= classifiedModuleName %> Directive', () => { beforeEachProviders((): any[] => []); - it('should ...', injectAsync([TestComponentBuilder], (tcb:TestComponentBuilder) => { + it('should ...', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => { return tcb.createAsync(TestComponent).then((fixture: ComponentFixture) => { fixture.detectChanges(); }); - })); + }))); }); diff --git a/addon/ng2/blueprints/ng2/files/karma.conf.js b/addon/ng2/blueprints/ng2/files/karma.conf.js index 384370fd1a1d..f3c187537843 100644 --- a/addon/ng2/blueprints/ng2/files/karma.conf.js +++ b/addon/ng2/blueprints/ng2/files/karma.conf.js @@ -18,6 +18,8 @@ module.exports = function (config) { { pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true }, { pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: true }, { pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: true }, + { pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: true }, + { pattern: 'node_modules/zone.js/dist/fake-async-test.js', included: true, watched: true }, { pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: true }, { pattern: 'node_modules/angular2/bundles/angular2.js', included: true, watched: true }, { pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: true }, diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json index 9484ecdb2442..a46e1c38416d 100644 --- a/addon/ng2/blueprints/ng2/files/package.json +++ b/addon/ng2/blueprints/ng2/files/package.json @@ -13,27 +13,27 @@ }, "private": true, "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", "systemjs": "0.19.20", - "zone.js": "^0.6.11" + "zone.js": "^0.6.12" }, "devDependencies": { "angular-cli": "0.0.*", "clang-format": "^1.0.35", "codelyzer": "0.0.14", "ember-cli-inject-live-reload": "^1.4.0", - "jasmine-core": "^2.3.4", + "jasmine-core": "^2.4.1", "jasmine-spec-reporter": "^2.4.0", "karma": "^0.13.15", - "karma-chrome-launcher": "^0.2.1", - "karma-jasmine": "^0.3.6", - "protractor": "^3.0.0", + "karma-chrome-launcher": "^0.2.3", + "karma-jasmine": "^0.3.8", + "protractor": "^3.3.0", "ts-node": "^0.5.5", "tslint": "^3.6.0", - "typescript": "^1.8.7", - "typings": "^0.7.12" + "typescript": "^1.8.10", + "typings": "^0.8.1" } } diff --git a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts index 46057a42f010..b120cdd7bf91 100644 --- a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts +++ b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts @@ -5,7 +5,6 @@ import { ddescribe, expect, inject, - injectAsync, TestComponentBuilder, beforeEachProviders } from 'angular2/testing'; diff --git a/addon/ng2/blueprints/route/index.js b/addon/ng2/blueprints/route/index.js index 64fabdfad591..0bf20d16c52d 100644 --- a/addon/ng2/blueprints/route/index.js +++ b/addon/ng2/blueprints/route/index.js @@ -129,13 +129,13 @@ module.exports = { normalizeEntityName: function (entityName) { var parsedPath = dynamicPathParser(this.project, entityName); - + // If a specified route starts with `+` remove it as it'd break convention. if (parsedPath.name[0] === '+') { var index = entityName.lastIndexOf(parsedPath.name); entityName = entityName.substr(0, index) + entityName.substr(index + 1); } - + this.dynamicPath = parsedPath; //leave the entity name intact for component generation diff --git a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts index 19f93088301c..e2c629499d21 100644 --- a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts +++ b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts @@ -1,12 +1,12 @@ import { + async, beforeEachProviders, it, iit, describe, ddescribe, expect, - inject, - injectAsync + inject } from 'angular2/testing'; import {provide} from 'angular2/core'; import {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>.service'; @@ -14,7 +14,7 @@ import {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>. describe('<%= classifiedModuleName %> Service', () => { beforeEachProviders(() => [<%= classifiedModuleName %>Service]); - + it('should ...', inject([<%= classifiedModuleName %>Service], (service: <%= classifiedModuleName %>Service) => { }));