Merge pull request #490 from eddiemonge/fix484

fix(app): services use classified names

Author: passy

Diff for: script-base.js

@@ -106,6 +106,11 @@ Generator.prototype.addScriptToIndex = function (script) {
 };
 
 Generator.prototype.generateSourceAndTest = function (appTemplate, testTemplate, targetDirectory, skipAdd) {
+  // Services use classified names
+  if (this.generatorName.toLowerCase() === 'service') {
+    this.cameledName = this.classedName;
+  }
+
   this.appTemplate(appTemplate, path.join('scripts', targetDirectory, this.name));
   this.testTemplate(testTemplate, path.join(targetDirectory, this.name));
   if (!skipAdd) {

Diff for: templates/coffeescript-min/spec/service.coffee

@@ -1,14 +1,14 @@
 'use strict'
 
-describe 'Service: <%= classedName %>', () ->
+describe 'Service: <%= cameledName %>', () ->
 
   # load the service's module
   beforeEach module '<%= scriptAppName %>'
 
   # instantiate service
-  <%= classedName %> = {}
-  beforeEach inject (_<%= classedName %>_) ->
-    <%= classedName %> = _<%= classedName %>_
+  <%= cameledName %> = {}
+  beforeEach inject (_<%= cameledName %>_) ->
+    <%= cameledName %> = _<%= cameledName %>_
 
   it 'should do something', () ->
-    expect(!!<%= classedName %>).toBe true
+    expect(!!<%= cameledName %>).toBe true

Diff for: templates/coffeescript/spec/service.coffee

@@ -1,14 +1,14 @@
 'use strict'
 
-describe 'Service: <%= classedName %>', () ->
+describe 'Service: <%= cameledName %>', () ->
 
   # load the service's module
   beforeEach module '<%= scriptAppName %>'
 
   # instantiate service
-  <%= classedName %> = {}
-  beforeEach inject (_<%= classedName %>_) ->
-    <%= classedName %> = _<%= classedName %>_
+  <%= cameledName %> = {}
+  beforeEach inject (_<%= cameledName %>_) ->
+    <%= cameledName %> = _<%= cameledName %>_
 
   it 'should do something', () ->
-    expect(!!<%= classedName %>).toBe true
+    expect(!!<%= cameledName %>).toBe true

Diff for: templates/javascript-min/spec/service.js

@@ -1,18 +1,18 @@
 'use strict';
 
-describe('Service: <%= classedName %>', function () {
+describe('Service: <%= cameledName %>', function () {
 
   // load the service's module
   beforeEach(module('<%= scriptAppName %>'));
 
   // instantiate service
-  var <%= classedName %>;
-  beforeEach(inject(function(_<%= classedName %>_) {
-    <%= classedName %> = _<%= classedName %>_;
+  var <%= cameledName %>;
+  beforeEach(inject(function(_<%= cameledName %>_) {
+    <%= cameledName %> = _<%= cameledName %>_;
   }));
 
   it('should do something', function () {
-    expect(!!<%= classedName %>).toBe(true);
+    expect(!!<%= cameledName %>).toBe(true);
   });
 
 });

Diff for: templates/javascript/spec/service.js

@@ -1,18 +1,18 @@
 'use strict';
 
-describe('Service: <%= classedName %>', function () {
+describe('Service: <%= cameledName %>', function () {
 
   // load the service's module
   beforeEach(module('<%= scriptAppName %>'));
 
   // instantiate service
-  var <%= classedName %>;
-  beforeEach(inject(function (_<%= classedName %>_) {
-    <%= classedName %> = _<%= classedName %>_;
+  var <%= cameledName %>;
+  beforeEach(inject(function (_<%= cameledName %>_) {
+    <%= cameledName %> = _<%= cameledName %>_;
   }));
 
   it('should do something', function () {
-    expect(!!<%= classedName %>).toBe(true);
+    expect(!!<%= cameledName %>).toBe(true);
   });
 
 });

Diff for: test/test-file-creation.js

@@ -167,8 +167,8 @@ describe('Angular generator', function () {
 
   describe('Service', function () {
     function serviceTest (generatorType, nameFn, done) {
-      generatorTest(generatorType, 'service', 'services', nameFn, _.classify, '', done);
-    };
+      generatorTest(generatorType, 'service', 'services', nameFn, nameFn, '', done);
+    }
 
     it('should generate a new constant', function (done) {
       serviceTest('constant', _.camelize, done);