From 1053d8e7879f98a61a679fe2d84063e88d3193f9 Mon Sep 17 00:00:00 2001 From: Ciro Nunes Date: Tue, 1 Dec 2015 16:01:05 -0200 Subject: [PATCH 1/2] fix(test): add support to deep directory structure --- addon/ng2/blueprints/ng2/files/karma-test-shim.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/karma-test-shim.js b/addon/ng2/blueprints/ng2/files/karma-test-shim.js index 126a1dc555e9..74dd6ad5aaca 100644 --- a/addon/ng2/blueprints/ng2/files/karma-test-shim.js +++ b/addon/ng2/blueprints/ng2/files/karma-test-shim.js @@ -37,7 +37,7 @@ System.import('angular2/src/core/dom/browser_adapter').then(function(browser_ada }); function onlyAppFiles(filePath) { - return /^\/base\/dist\/app\/(?!spec)([a-z0-9-_]+)\.js$/.test(filePath); + return /^\/base\/dist\/app\/(?!spec)([a-z0-9-_\/]+)\.js$/.test(filePath); } function onlySpecFiles(path) { From b4eadfb5fa26b15bda677dbbdf59d8f1e41a17bf Mon Sep 17 00:00:00 2001 From: Ciro Nunes Date: Tue, 1 Dec 2015 16:19:58 -0200 Subject: [PATCH 2/2] fix(generators): add missing references --- .../pipe/files/src/app/pipes/__name__/__name__.spec.ts | 3 ++- .../pipe/files/src/app/pipes/__name__/__name__.ts | 5 +++-- .../files/src/app/services/__name__/__name__.spec.ts | 6 +++--- .../service/files/src/app/services/__name__/__name__.ts | 6 ++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.spec.ts b/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.spec.ts index b967042fc2b3..c415841943af 100644 --- a/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.spec.ts +++ b/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.spec.ts @@ -15,7 +15,7 @@ import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>'; describe('<%= classifiedModuleName %> Pipe', () => { - beforeEachProviders(() => []); + beforeEachProviders(() => [<%= classifiedModuleName %>]); it('should ...', inject([<%= classifiedModuleName %>], (pipe:<%= classifiedModuleName %>) => { @@ -23,3 +23,4 @@ describe('<%= classifiedModuleName %> Pipe', () => { })); }); + diff --git a/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.ts b/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.ts index 61c56077c0b1..cdd65236de27 100644 --- a/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.ts +++ b/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.ts @@ -7,7 +7,8 @@ import {Pipe} from 'angular2/angular2'; export class <%= classifiedModuleName %> { transform(value, args?) { - return value; + return !value; } -} \ No newline at end of file +} + diff --git a/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.spec.ts b/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.spec.ts index 2d735fd2689c..8df12e1e44f6 100644 --- a/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.spec.ts +++ b/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.spec.ts @@ -15,11 +15,11 @@ import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>'; describe('<%= classifiedModuleName %> Service', () => { - beforeEachProviders(() => []); + beforeEachProviders(() => [<%= classifiedModuleName %>]); - it('should ...', inject([<%= classifiedModuleName %>], (service:<%= classifiedModuleName %>) => { - + it('should do something', inject([<%= classifiedModuleName %>], (service:<%= classifiedModuleName %>) => { + expect(service.doSomething()).toBe('something'); })); }); diff --git a/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.ts b/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.ts index 8a3f4193bc44..545d16c5e4c9 100644 --- a/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.ts +++ b/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.ts @@ -4,6 +4,8 @@ import {Injectable} from 'angular2/angular2'; @Injectable() export class <%= classifiedModuleName %> { - constructor() {} + doSomething() { + return 'something'; + } -} \ No newline at end of file +}