Skip to content

Commit 6e73121

Browse files
committed
bug(directive): update directive class name to match style guide
Fixes angular#1217
1 parent 22a6b59 commit 6e73121

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.direc
55

66
describe('Directive: <%= classifiedModuleName %>', () => {
77
it('should create an instance', () => {
8-
let directive = new <%= classifiedModuleName %>();
8+
let directive = new <%= classifiedModuleName %>Directive();
99
expect(directive).toBeTruthy();
1010
});
1111
});

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Directive } from '@angular/core';
33
@Directive({
44
selector: '[<%= rawEntityName %>]'
55
})
6-
export class <%= classifiedModuleName %> {
6+
export class <%= classifiedModuleName %>Directive {
77

88
constructor() { }
99

addon/ng2/blueprints/directive/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module.exports = {
4747

4848
const returns = [];
4949
const modulePath = path.join(this.project.root, this.dynamicPath.appRoot, 'app.module.ts');
50-
const className = stringUtils.classify(`${options.entity.name}`);
50+
const className = stringUtils.classify(`${options.entity.name}Directive`);
5151
const fileName = stringUtils.dasherize(`${options.entity.name}.directive`);
5252
const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
5353
const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;

tests/acceptance/generate-directive.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ describe('Acceptance: ng generate directive', function () {
5050
.then(() => expect(existsSync(testPath)).to.equal(true))
5151
.then(() => readFile(appModulePath, 'utf-8'))
5252
.then(content => {
53-
expect(content).matches(/import.*\bMyDir\b.*from '.\/my-dir\/my-dir.directive';/);
54-
expect(content).matches(/declarations:\s*\[[^\]]+?,\n\s+MyDir\n/m);
53+
expect(content).matches(/import.*\bMyDirDirective\b.*from '.\/my-dir\/my-dir.directive';/);
54+
expect(content).matches(/declarations:\s*\[[^\]]+?,\n\s+MyDirDirective\n/m);
5555
});
5656
});
5757

0 commit comments

Comments
 (0)