Merge branch 'canary' of https://github.com/DaftMonk/generator-angular-fullstack

Author: Awk34

app/index.js

@@ -26,15 +26,12 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
 
       this.filters = {};
 
-      // dynamic assertion statement
-      this.does = this.is = function(foo) {
-        foo = this.engine(foo.replace(/\(;>%%<;\)/g, '<%')
-          .replace(/\(;>%<;\)/g, '%>'), this);
-        if (this.filters.should) {
-          return foo + '.should';
-        } else {
-          return 'expect(' + foo + ').to';
-        }
+      // dynamic assertion statements
+      this.expect = function() {
+        return this.filters.expect ? 'expect(' : '';
+      }.bind(this);
+      this.to = function() {
+        return this.filters.expect ? ').to' : '.should';
       }.bind(this);
     },
 

app/templates/client/app/account(auth)/login/login(html).html

@@ -4,8 +4,8 @@
   <div class="row">
     <div class="col-sm-12">
       <h1>Login</h1>
-      <p>Accounts are reset on server restart from <code>server/config/seed.js</code>. Default account is <code>test@test.com</code> / <code>test</code></p>
-      <p>Admin account is <code>admin@admin.com</code> / <code>admin</code></p>
+      <p>Accounts are reset on server restart from <code>server/config/seed.js</code>. Default account is <code>test@example.com</code> / <code>test</code></p>
+      <p>Admin account is <code>admin@example.com</code> / <code>admin</code></p>
     </div>
     <div class="col-sm-12">
       <form class="form" name="form" ng-submit="login(form)" novalidate>

app/templates/client/app/account(auth)/login/login(jade).jade

@@ -7,12 +7,12 @@ navbar
         | Accounts are reset on server restart from
         code server/config/seed.js
         | . Default account is
-        code test@test.com
+        code test@example.com
         | /
         code test
       p
         | Admin account is
-        code admin@admin.com
+        code admin@example.com
         | /
         code admin
 

app/templates/client/app/admin(auth)/admin.controller(coffee).coffee

@@ -3,9 +3,7 @@
 angular.module '<%= scriptAppName %>'
 .controller 'AdminCtrl', ($scope, $http, Auth, User) ->
 
-  $http.get '/api/users'
-  .success (users) ->
-    $scope.users = users
+  $scope.users = User.query()
 
   $scope.delete = (user) ->
     User.remove id: user._id

app/templates/client/app/main/main.controller(coffee).coffee

@@ -4,8 +4,8 @@ angular.module '<%= scriptAppName %>'
 .controller 'MainCtrl', ($scope, $http<% if (filters.socketio) { %>, socket<% } %>) ->
   $scope.awesomeThings = []
 
-  $http.get('/api/things').success (awesomeThings) ->
-    $scope.awesomeThings = awesomeThings
+  $http.get('/api/things').then (response) ->
+    $scope.awesomeThings = response.data
     <% if (filters.socketio) { %>socket.syncUpdates 'thing', $scope.awesomeThings<% } %>
 <% if (filters.models) { %>
   $scope.addThing = ->

app/templates/client/app/main/main.controller(js).js

@@ -4,8 +4,8 @@ angular.module('<%= scriptAppName %>')
   .controller('MainCtrl', function($scope, $http<% if (filters.socketio) { %>, socket<% } %>) {
     $scope.awesomeThings = [];
 
-    $http.get('/api/things').success(function(awesomeThings) {
-      $scope.awesomeThings = awesomeThings;<% if (filters.socketio) { %>
+    $http.get('/api/things').then(function(response) {
+      $scope.awesomeThings = response.data;<% if (filters.socketio) { %>
       socket.syncUpdates('thing', $scope.awesomeThings);<% } %>
     });
 <% if (filters.models) { %>

app/templates/client/app/main/main.controller.spec(coffee).coffee

@@ -29,4 +29,4 @@ describe 'Controller: MainCtrl', ->
   it 'should attach a list of things to the scope', ->
     $httpBackend.flush()<% if (filters.jasmine) { %>
     expect(scope.awesomeThings.length).toBe 4 <% } if (filters.mocha) { %>
-    <%= does("scope.awesomeThings.length") %>.equal 4<% } %>
+    <%= expect() %>scope.awesomeThings.length<%= to() %>.equal 4<% } %>

app/templates/client/app/main/main.controller.spec(js).js

@@ -28,6 +28,6 @@ describe('Controller: MainCtrl', function() {
   it('should attach a list of things to the scope', function() {
     $httpBackend.flush();<% if (filters.jasmine) { %>
     expect(scope.awesomeThings.length).toBe(4);<% } if (filters.mocha) { %>
-    <%= does("scope.awesomeThings.length") %>.equal(4);<% } %>
+    <%= expect() %>scope.awesomeThings.length<%= to() %>.equal(4);<% } %>
   });
 });

app/templates/client/components/auth(auth)/user.service(js).js

@@ -18,5 +18,5 @@ angular.module('<%= scriptAppName %>')
           id:'me'
         }
       }
-	  });
+    });
   });

app/templates/e2e/account(auth)/login/login.spec(jasmine).js

@@ -14,7 +14,7 @@ describe('Login View', function() {
 
   var testUser = {
     name: 'Test User',
-    email: 'test@test.com',
+    email: 'test@example.com',
     password: 'test'
   };