Merge branch 'master' into angular-2.1.0

Author: filipesilva

packages/angular-cli/blueprints/class/index.js

@@ -6,26 +6,26 @@ const getFiles = Blueprint.prototype.files;
 module.exports = {
   description: '',
 
-  anonymousOptions: [
-    '<class-type>'
-  ],
-
   availableOptions: [
     { name: 'spec', type: Boolean }
   ],
 
   normalizeEntityName: function (entityName) {
-    var parsedPath = dynamicPathParser(this.project, entityName);
+    var parsedPath = dynamicPathParser(this.project, entityName.split('.')[0]);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
   },
 
   locals: function (options) {
-    var classType = options.args [2]
+    const rawName = options.args[1];
+    const nameParts = rawName.split('.')
+      .filter(part => part.length !== 0);
+
+    const classType = nameParts[1];
     this.fileName = stringUtils.dasherize(options.entity.name);
     if (classType) {
-      this.fileName += '.' + classType;
+      this.fileName += '.' + classType.toLowerCase();
     }
 
     options.spec = options.spec !== undefined ?

packages/angular-cli/blueprints/component/files/__path__/__name__.component.spec.ts

@@ -1,11 +1,28 @@
 /* tslint:disable:no-unused-variable */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
 
-import { TestBed, async } from '@angular/core/testing';
 import { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
 
-describe('Component: <%= classifiedModuleName %>', () => {
-  it('should create an instance', () => {
-    let component = new <%= classifiedModuleName %>Component();
+describe('<%= classifiedModuleName %>Component', () => {
+  let component: <%= classifiedModuleName %>Component;
+  let fixture: ComponentFixture<<%= classifiedModuleName %>Component>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ <%= classifiedModuleName %>Component ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(<%= classifiedModuleName %>Component);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
     expect(component).toBeTruthy();
   });
 });

tests/acceptance/generate-class.spec.js

@@ -43,8 +43,8 @@ describe('Acceptance: ng generate class', function () {
     });
   });
 
-  it('ng generate class my-class model', function () {
-    return ng(['generate', 'class', 'my-class', 'model']).then(() => {
+  it('ng generate class my-class.model', function () {
+    return ng(['generate', 'class', 'my-class.model']).then(() => {
       expect(existsSync(path.join(testPath, 'my-class.model.ts'))).to.equal(true);
     });
   });
@@ -55,8 +55,8 @@ describe('Acceptance: ng generate class', function () {
     });
   });
 
-  it(`ng generate class shared${path.sep}my-class model`, function () {
-    return ng(['generate', 'class', 'shared/my-class', 'model']).then(() => {
+  it(`ng generate class shared${path.sep}my-class.model`, function () {
+    return ng(['generate', 'class', 'shared/my-class.model']).then(() => {
       expect(existsSync(path.join(testPath, 'shared', 'my-class.model.ts'))).to.equal(true);
     });
   });