Fix up tests and add PhantomJS back to test suite

Author: davej

package.json

@@ -22,6 +22,8 @@
     "karma-benchmark-reporter": "^0.1.1",
     "karma-firefox-launcher": "^0.1.3",
     "karma-jasmine": "^0.1.5",
-    "node-karma-wrapper": "^0.2.2"
+    "karma-phantomjs-launcher": "^1.0.0",
+    "node-karma-wrapper": "^0.2.2",
+    "phantomjs-prebuilt": "^2.1.4"
   }
 }

test/karma.conf.js

@@ -12,7 +12,7 @@ module.exports = function(config) {
       'test/unit/*.js'
     ],
     autoWatch: false,
-    singleRun: true,
-    browsers: ['Firefox']
+    singleRun: false,
+    browsers: ['Firefox', 'PhantomJS']
   });
 };

test/unit/todoAsCtrlSpec.js

@@ -2,7 +2,7 @@
 (function () {
 	'use strict';
 
-	describe('Todo Javascript Classy Controller', function () {
+	describe('Todo Javascript Classy ControllerAs', function () {
 		var ctrl, scope;
 		var todoList;
 		var todoStorage = {
@@ -14,34 +14,39 @@
 				this.storage = value;
 			}
 		};
+		todoStorage.storage = [];
 		var ctrlName = 'TodoAsControllerCtrl as todoCtrl';
 
 			// Load the module containing the app, only 'ng' is loaded by default.
 		beforeEach(module('todomvc'));
 
 		beforeEach(inject(function ($controller, $rootScope) {
 			scope = $rootScope.$new();
-			ctrl = $controller(ctrlName, { $scope: scope });
+			ctrl = $controller(ctrlName, { $scope: scope, todoStorage: todoStorage });
 		}));
 
-		it('should not have any controller methods placed on the scope', function () {
-			expect(scope.todos).toBeUndefined();
-			expect(scope.editTodo).toBeUndefined();
-		});
 
-		it('should not have an edited Todo on start', function () {
-			expect(ctrl.editedTodo).toBeNull();
-		});
+		describe('init', function() {
+			it('should not have any controller methods placed on the scope', function () {
+				expect(scope.todos).toBeUndefined();
+				expect(scope.editTodo).toBeUndefined();
+			});
 
-		it('should not have any Todos on start', function () {
-			expect(ctrl.todos.length).toBe(0);
-		});
+			it('should not have an edited Todo on start', function () {
+				expect(ctrl.editedTodo).toBeNull();
+			});
 
-		it('should have all Todos completed', function () {
-			scope.$digest();
-			expect(ctrl.allChecked).toBeTruthy();
+			it('should not have any Todos on start', function () {
+				expect(ctrl.todos.length).toBe(0);
+			});
+
+			it('should have all Todos completed', function () {
+				scope.$digest();
+				expect(ctrl.allChecked).toBeTruthy();
+			});
 		});
 
+
 		describe('the path', function () {
 			it('should default to "/"', function () {
 				expect(ctrl.$location.path()).toBe('/');
@@ -79,7 +84,6 @@
 			var ctrl;
 
 			beforeEach(inject(function ($controller) {
-				todoStorage.storage = [];
 				ctrl = $controller(ctrlName, {
 					$scope: scope,
 					todoStorage: todoStorage

test/unit/todoCtrlSpec.js

@@ -14,14 +14,15 @@
 				this.storage = value;
 			}
 		};
+		todoStorage.storage = [];
 		var ctrlName = 'TodoCtrl';
 
 			// Load the module containing the app, only 'ng' is loaded by default.
 		beforeEach(module('todomvc'));
 
 		beforeEach(inject(function ($controller, $rootScope) {
 			scope = $rootScope.$new();
-			ctrl = $controller(ctrlName, { $scope: scope });
+			ctrl = $controller(ctrlName, { $scope: scope, todoStorage: todoStorage });
 		}));
 
 		it('should not have an edited Todo on start', function () {
@@ -74,7 +75,6 @@
 			var ctrl;
 
 			beforeEach(inject(function ($controller) {
-				todoStorage.storage = [];
 				ctrl = $controller(ctrlName, {
 					$scope: scope,
 					todoStorage: todoStorage