chore: fix all linting issues with generated app (angular#611)

Author: hansl

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

@@ -1,20 +1,46 @@
 import {
-  async,
+  beforeEach,
   beforeEachProviders,
   describe,
-  ddescribe,
   expect,
-  iit,
   it,
-  inject
+  inject,
 } from '@angular/core/testing';
 import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
+import { Component } from '@angular/core';
+import { By } from '@angular/platform-browser';
 import { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
 
 describe('Component: <%= classifiedModuleName %>', () => {
+  let builder: TestComponentBuilder;
+
   beforeEachProviders(() => [<%= classifiedModuleName %>Component]);
-  
-  it('should create the component', inject([<%= classifiedModuleName %>Component], (component: <%= classifiedModuleName %>Component) => { 
-    expect(component).toBeTruthy(); 
-  })); 
+  beforeEach(inject([TestComponentBuilder], function (tcb: TestComponentBuilder) {
+    builder = tcb;
+  }));
+
+  it('should inject the component', inject([<%= classifiedModuleName %>Component],
+      (component: <%= classifiedModuleName %>Component) => {
+    expect(component).toBeTruthy();
+  }));
+
+  it('should create the component', inject([], () => {
+    return builder.createAsync(<%= classifiedModuleName %>ComponentTestController)
+      .then((fixture: ComponentFixture<any>) => {
+        let query = fixture.debugElement.query(By.directive(<%= classifiedModuleName %>Component));
+        expect(query).toBeTruthy();
+        expect(query.componentInstance).toBeTruthy();
+      });
+  }));
 });
+
+@Component({
+  selector: 'test',
+  template: `
+    <<%= selector %>></<%= selector %>>
+  `,
+  directives: [<%= classifiedModuleName %>Component]
+})
+class <%= classifiedModuleName %>ComponentTestController {
+}
+

addon/ng2/blueprints/directive/files/__path__/index.ts

@@ -1 +1 @@
-export {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.directive';
+export {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.directive';

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

@@ -1,24 +1,22 @@
 import {
-  async,
   beforeEachProviders,
   describe,
-  ddescribe,
   expect,
-  iit,
   it,
   inject
 } from '@angular/core/testing';
-import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
 import { <%= jsComponentName %>AppComponent } from '../app/<%= htmlComponentName %>.component';
 
 beforeEachProviders(() => [<%= jsComponentName %>AppComponent]);
 
 describe('App: <%= jsComponentName %>', () => {
-  it('should create the app', inject([<%= jsComponentName %>AppComponent], (app: <%= jsComponentName %>AppComponent) => {
+  it('should create the app',
+      inject([<%= jsComponentName %>AppComponent], (app: <%= jsComponentName %>AppComponent) => {
     expect(app).toBeTruthy();
   }));
 
-  it('should have as title \'<%= htmlComponentName %> works!\'', inject([<%= jsComponentName %>AppComponent], (app: <%= jsComponentName %>AppComponent) => {
+  it('should have as title \'<%= htmlComponentName %> works!\'',
+      inject([<%= jsComponentName %>AppComponent], (app: <%= jsComponentName %>AppComponent) => {
     expect(app.title).toEqual('<%= htmlComponentName %> works!');
   }));
 });

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

@@ -1,20 +1,16 @@
 import {
   it,
-  iit,
   describe,
-  ddescribe,
   expect,
   inject,
   beforeEachProviders
 } from '@angular/core/testing';
-import { TestComponentBuilder } from '@angular/compiler/testing';
-import { provide } from '@angular/core';
 import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.pipe';
 
 describe('<%= classifiedModuleName %> Pipe', () => {
   beforeEachProviders(() => [<%= classifiedModuleName%>]);
 
-  it('should transform the input', inject([<%= classifiedModuleName %>], (pipe:<%= classifiedModuleName %>) => {
+  it('should transform the input', inject([<%= classifiedModuleName %>], (pipe: <%= classifiedModuleName %>) => {
       expect(pipe.transform(true)).toBe(null);
   }));
 });

addon/ng2/blueprints/pipe/files/__path__/index.ts

@@ -1 +1 @@
-export { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.pipe';
+export { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.pipe';

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

@@ -1,22 +1,17 @@
 import {
-  async,
   beforeEachProviders,
   it,
-  iit,
   describe,
-  ddescribe,
   expect,
   inject
 } from '@angular/core/testing';
-import { provide } from '@angular/core';
 import { <%= classifiedModuleName %>Service } from './<%= dasherizedModuleName %>.service';
 
 describe('<%= classifiedModuleName %> Service', () => {
-
   beforeEachProviders(() => [<%= classifiedModuleName %>Service]);
 
-  it('should ...', inject([<%= classifiedModuleName %>Service], (service: <%= classifiedModuleName %>Service) => {
-
+  it('should ...',
+      inject([<%= classifiedModuleName %>Service], (service: <%= classifiedModuleName %>Service) => {
+    expect(service).toBeTruthy();
   }));
-
 });

addon/ng2/blueprints/service/files/__path__/index.ts

@@ -1 +1 @@
-export {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>.service';
+export {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>.service';

addon/ng2/tasks/lint.ts

@@ -7,15 +7,16 @@ module.exports = Task.extend({
   run: function () {
     var ui = this.ui;
 
-    return new Promise(function(resolve) {
+    return new Promise(function(resolve, reject) {
       exec('npm run lint', (err, stdout) => {
         ui.writeLine(stdout);
         if (err) {
           ui.writeLine(chalk.red('Lint errors found in the listed files.'));
+          reject();
         } else {
           ui.writeLine(chalk.green('All files pass linting.'));
+          resolve();
         }
-        resolve();
       });
     });
   }

lib/cli/index.js

@@ -100,4 +100,4 @@ module.exports = function(options) {
   process.env.CLI_ROOT = process.env.CLI_ROOT || path.resolve(__dirname, '..', '..');
 
   return cli(options);
-}
+};

tests/e2e/e2e_workflow.spec.js

@@ -88,6 +88,16 @@ describe('Basic end-to-end Workflow', function () {
       });
   });
 
+  it('lints', () => {
+    this.timeout(420000);
+
+    return ng(['lint']).then(() => {
+    })
+    .catch(err => {
+      throw new Error('Linting failed: ' + err);
+    });
+  });
+
   it('Perform `ng test` after initial build', function () {
     this.timeout(420000);