chore(template): clean up templates

delasteve · delasteve · commit baad1d3aff13 · 2016-07-05T20:45:09.000-04:00
diff --git a/addon/ng2/blueprints/class/files/__path__/__name__.spec.ts b/addon/ng2/blueprints/class/files/__path__/__name__.spec.ts
@@ -1,11 +1,6 @@
 /* tslint:disable:no-unused-variable */
 
-import {
-  beforeEach, beforeEachProviders,
-  describe, xdescribe,
-  expect, it, xit,
-  async, inject
-} from '@angular/core/testing';
+import { addProviders, async, inject } from '@angular/core/testing';
 import {<%= classifiedModuleName %>} from './<%= fileName %>';
 
 describe('<%= classifiedModuleName %>', () => {
diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
@@ -2,14 +2,7 @@
 
 import { By }           from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-
-import {
-  beforeEach, beforeEachProviders,
-  describe, xdescribe,
-  expect, it, xit,
-  async, inject
-} from '@angular/core/testing';
-
+import { addProviders, async, inject } from '@angular/core/testing';
 import { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
 
 describe('Component: <%= classifiedModuleName %>', () => {
diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.ts
@@ -14,7 +14,7 @@ import { Component, OnInit } from '@angular/core';
 })
 export class <%= classifiedModuleName %>Component implements OnInit {
 
-  constructor() {}
+  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
@@ -1,14 +1,9 @@
 /* tslint:disable:no-unused-variable */
 
-import {
-  beforeEach, beforeEachProviders,
-  describe, xdescribe,
-  expect, it, xit,
-  async, inject
-} from '@angular/core/testing';
+import { addProviders, async, inject } from '@angular/core/testing';
 import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.directive';
 
-describe('<%= classifiedModuleName %> Directive', () => {
+describe('Directive: <%= classifiedModuleName %>', () => {
   it('should create an instance', () => {
     let directive = new <%= classifiedModuleName %>();
     expect(directive).toBeTruthy();
diff --git a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts
@@ -5,6 +5,6 @@ import { Directive } from '@angular/core';
 })
 export class <%= classifiedModuleName %> {
 
-  constructor() {}
+  constructor() { }
 
 }
diff --git a/addon/ng2/blueprints/enum/files/__path__/__name__.enum.ts b/addon/ng2/blueprints/enum/files/__path__/__name__.enum.ts
@@ -1,3 +1,2 @@
 export enum <%= classifiedModuleName %> {
-
 }
diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/app.component.spec.ts b/addon/ng2/blueprints/ng2/files/__path__/app/app.component.spec.ts
@@ -1,23 +1,20 @@
 /* tslint:disable:no-unused-variable */
 
-import {
-  beforeEach, beforeEachProviders,
-  describe, xdescribe,
-  expect, it, xit,
-  async, inject
-} from '@angular/core/testing';
+import { addProviders, async, inject } from '@angular/core/testing';
 import { AppComponent } from './app.component';
 
-beforeEachProviders(() => [AppComponent]);
-
 describe('App: <%= jsComponentName %>', () => {
+  beforeEach(() => {
+    addProviders([AppComponent]);
+  });
+
   it('should create the app',
-      inject([AppComponent], (app: AppComponent) => {
-    expect(app).toBeTruthy();
-  }));
+    inject([AppComponent], (app: AppComponent) => {
+      expect(app).toBeTruthy();
+    }));
 
   it('should have as title \'app works!\'',
-      inject([AppComponent], (app: AppComponent) => {
-    expect(app.title).toEqual('app works!');
-  }));
+    inject([AppComponent], (app: AppComponent) => {
+      expect(app.title).toEqual('app works!');
+    }));
 });
diff --git a/addon/ng2/blueprints/ng2/files/__path__/index.html b/addon/ng2/blueprints/ng2/files/__path__/index.html
@@ -30,9 +30,7 @@
 </head>
 <body>
   <<%= prefix %>-root>Loading...</<%= prefix %>-root>
-
   <% if (isMobile) { %>
-
     {{#if environment.production}}
       <script src="/app-concat.js" async></script>
     {{else}}
@@ -45,9 +43,7 @@
         }).catch(console.error.bind(console));
       </script>
     {{/if}}
-
   <% } else { %>
-
     {{#each scripts.polyfills}}
     <script src="{{.}}"></script>
     {{/each}}
@@ -56,8 +52,6 @@
         System.import('main');
       }).catch(console.error.bind(console));
     </script>
-
   <% } %>
-
 </body>
 </html>
diff --git a/addon/ng2/blueprints/ng2/files/__path__/main.ts b/addon/ng2/blueprints/ng2/files/__path__/main.ts
@@ -8,4 +8,3 @@ if (environment.production) {
 }
 
 bootstrap(AppComponent<% if(isMobile) { %>, [ APP_SHELL_RUNTIME_PROVIDERS ]<% } %>);
-
diff --git a/addon/ng2/blueprints/ng2/files/config/environment.js b/addon/ng2/blueprints/ng2/files/config/environment.js
@@ -10,4 +10,3 @@ module.exports = function(environment) {
     locationType: 'auto'
   };
 };
-
diff --git a/addon/ng2/blueprints/ng2/files/config/karma-test-shim.js b/addon/ng2/blueprints/ng2/files/config/karma-test-shim.js
@@ -53,4 +53,4 @@ System.import('system-config.js').then(function() {
     allSpecFiles.map(function (moduleName) {
       return System.import(moduleName);
     }));
-}).then(__karma__.start, __karma__.error);
+}).then(__karma__.start, __karma__.error);
diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json
@@ -13,13 +13,13 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "2.0.0-rc.3",
-    "@angular/compiler": "2.0.0-rc.3",
-    "@angular/core": "2.0.0-rc.3",
+    "@angular/common": "2.0.0-rc.4",
+    "@angular/compiler": "2.0.0-rc.4",
+    "@angular/core": "2.0.0-rc.4",
     "@angular/forms": "0.2.0",
-    "@angular/http": "2.0.0-rc.3",
-    "@angular/platform-browser": "2.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/http": "2.0.0-rc.4",
+    "@angular/platform-browser": "2.0.0-rc.4",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.4",
     "@angular/router": "3.0.0-beta.2",
     "es6-shim": "0.35.1",
     "reflect-metadata": "0.1.3",
@@ -28,7 +28,7 @@
     "zone.js": "0.6.12"
   },
   "devDependencies": {<% if(isMobile) { %>
-    "@angular/platform-server": "2.0.0-rc.3",
+    "@angular/platform-server": "2.0.0-rc.4",
     "@angular/service-worker": "0.2.0",
     "@angular/app-shell": "0.0.0",
     "angular2-broccoli-prerender": "0.11.0",
diff --git a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
@@ -1,11 +1,6 @@
 /* tslint:disable:no-unused-variable */
 
-import {
-  beforeEach, beforeEachProviders,
-  describe, xdescribe,
-  expect, it, xit,
-  async, inject
-} from '@angular/core/testing';
+import { addProviders, async, inject } from '@angular/core/testing';
 import { <%= classifiedModuleName %>Pipe } from './<%= dasherizedModuleName %>.pipe';
 
 describe('Pipe: <%= classifiedModuleName %>', () => {
diff --git a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
@@ -1,18 +1,16 @@
 /* tslint:disable:no-unused-variable */
 
-import {
-  beforeEach, beforeEachProviders,
-  describe, xdescribe,
-  expect, it, xit,
-  async, inject
-} from '@angular/core/testing';
+import { addProviders, async, inject } from '@angular/core/testing';
 import { <%= classifiedModuleName %>Service } from './<%= dasherizedModuleName %>.service';
 
-describe('<%= classifiedModuleName %> Service', () => {
-  beforeEachProviders(() => [<%= classifiedModuleName %>Service]);
+describe('Service: <%= classifiedModuleName %>', () => {
+  beforeEach(() => {
+    addProviders([<%= classifiedModuleName %>Service]);
+  });
 
   it('should ...',
-      inject([<%= classifiedModuleName %>Service], (service: <%= classifiedModuleName %>Service) => {
-    expect(service).toBeTruthy();
-  }));
+    inject([<%= classifiedModuleName %>Service],
+      (service: <%= classifiedModuleName %>Service) => {
+        expect(service).toBeTruthy();
+      }));
 });
diff --git a/addon/ng2/blueprints/service/files/__path__/__name__.service.ts b/addon/ng2/blueprints/service/files/__path__/__name__.service.ts
@@ -3,6 +3,6 @@ import { Injectable } from '@angular/core';
 @Injectable()
 export class <%= classifiedModuleName %>Service {
 
-  constructor() {}
+  constructor() { }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import { Component, OnInit } from '@angular/core';`
`14`	`14`	`})`
`15`	`15`	`export class <%= classifiedModuleName %>Component implements OnInit {`
`16`	`16`
`17`		`- constructor() {}`
	`17`	`+ constructor() { }`
`18`	`18`
`19`	`19`	`ngOnInit() {`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ import { Directive } from '@angular/core';`
`5`	`5`	`})`
`6`	`6`	`export class <%= classifiedModuleName %> {`
`7`	`7`
`8`		`- constructor() {}`
	`8`	`+ constructor() { }`
`9`	`9`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`export enum <%= classifiedModuleName %> {`
`2`		`-`
`3`	`2`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,3 @@ if (environment.production) {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`bootstrap(AppComponent<% if(isMobile) { %>, [ APP_SHELL_RUNTIME_PROVIDERS ]<% } %>);`
`11`		`-`
-Original file line number
+Diff line change
     locationType: 'auto'
   };
 };
+-
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import { Injectable } from '@angular/core';`
`3`	`3`	`@Injectable()`
`4`	`4`	`export class <%= classifiedModuleName %>Service {`
`5`	`5`
`6`		`- constructor() {}`
	`6`	`+ constructor() { }`
`7`	`7`
`8`	`8`	`}`