feat(app): use controller as syntax

close #1033
yeoman · Mar 19, 2015 · 570fbf2 · 570fbf2 · maxfelker · Aug 17, 2015
1 parent 0994fcb
commit 570fbf2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/route/index.js b/route/index.js
@@ -60,7 +60,8 @@ Generator.prototype.rewriteAppJs = function () {
     needle: '.otherwise',
     splicable: [
       "  templateUrl: 'views/" + this.name.toLowerCase() + ".html'" + (coffee ? "" : "," ),
-      "  controller: '" + this.classedName + "Ctrl'"
+      "  controller: '" + this.classedName + "Ctrl'" + (coffee ? "" : ","),
+      "  controllerAs: '" + this.classedName + "'"
     ]
   };
 

diff --git a/templates/coffeescript/app.coffee b/templates/coffeescript/app.coffee
@@ -15,6 +15,7 @@ angular
       .when '/',
         templateUrl: 'views/main.html'
         controller: 'MainCtrl'
+        controllerAs: 'main'
       .otherwise
         redirectTo: '/'
 <% } %>
diff --git a/templates/coffeescript/controller.coffee b/templates/coffeescript/controller.coffee
@@ -8,9 +8,10 @@
  # Controller of the <%= scriptAppName %>
 ###
 angular.module '<%= scriptAppName %>'
-  .controller '<%= classedName %>Ctrl', ($scope) ->
-    $scope.awesomeThings = [
+  .controller '<%= classedName %>Ctrl', () ->
+    @awesomeThings = [
       'HTML5 Boilerplate'
       'AngularJS'
       'Karma'
     ]
+    return
diff --git a/templates/coffeescript/spec/controller.coffee b/templates/coffeescript/spec/controller.coffee
@@ -6,14 +6,12 @@ describe 'Controller: <%= classedName %>Ctrl', ->
   beforeEach module '<%= scriptAppName %>'
 
   <%= classedName %>Ctrl = {}
-  scope = {}
 
   # Initialize the controller and a mock scope
   beforeEach inject ($controller, $rootScope) ->
-    scope = $rootScope.$new()
     <%= classedName %>Ctrl = $controller '<%= classedName %>Ctrl', {
-      $scope: scope
+      # place here mocked dependencies
     }
 
   it 'should attach a list of awesomeThings to the scope', ->
-    expect(scope.awesomeThings.length).toBe 3
+    expect(<%= classedName %>Ctrl.awesomeThings.length).toBe 3
diff --git a/templates/javascript/app.js b/templates/javascript/app.js
@@ -14,7 +14,8 @@ angular
     $routeProvider
       .when('/', {
         templateUrl: 'views/main.html',
-        controller: 'MainCtrl'
+        controller: 'MainCtrl',
+        controllerAs: 'main'
       })
       .otherwise({
         redirectTo: '/'

diff --git a/templates/javascript/controller.js b/templates/javascript/controller.js
@@ -8,8 +8,8 @@
  * Controller of the <%= scriptAppName %>
  */
 angular.module('<%= scriptAppName %>')
-  .controller('<%= classedName %>Ctrl', function ($scope) {
-    $scope.awesomeThings = [
+  .controller('<%= classedName %>Ctrl', function () {
+    @awesomeThings = [
       'HTML5 Boilerplate',
       'AngularJS',
       'Karma'

diff --git a/templates/javascript/spec/controller.js b/templates/javascript/spec/controller.js
@@ -5,18 +5,16 @@ describe('Controller: <%= classedName %>Ctrl', function () {
   // load the controller's module
   beforeEach(module('<%= scriptAppName %>'));
 
-  var <%= classedName %>Ctrl,
-    scope;
+  var <%= classedName %>Ctrl;
 
   // Initialize the controller and a mock scope
   beforeEach(inject(function ($controller, $rootScope) {
-    scope = $rootScope.$new();
     <%= classedName %>Ctrl = $controller('<%= classedName %>Ctrl', {
-      $scope: scope
+      // place here mocked dependencies
     });
   }));
 
   it('should attach a list of awesomeThings to the scope', function () {
-    expect(scope.awesomeThings.length).toBe(3);
+    expect(<%= classedName %>Ctrl.awesomeThings.length).toBe(3);
   });
 });