Updates to `AngularJS+RequireJS` app

Replaces `angular-loader` with a better RequireJS setup Also adds tests (#254) Closes #1277 Fixes #1276

Updates to `AngularJS+RequireJS` app
Replaces `angular-loader` with a better RequireJS setup Also adds tests (#254) Closes #1277 Fixes #1276
be58d7ce · Leonardo Giovanetti · Arthur Verschaeve · fcb062f4 · be58d7ce · be58d7ce
Commit be58d7ce authored Apr 27, 2015 by Leonardo Giovanetti Committed by Arthur Verschaeve May 03, 2015
15 changed files
--- a/examples/angularjs_require/.gitignore
+++ b/examples/angularjs_require/.gitignore
@@ -3,9 +3,6 @@ node_modules/*
 node_modules/angular/*
 !node_modules/angular/angular.js
-node_modules/angular-loader/*
-!node_modules/angular-loader/angular-loader.js
 node_modules/requirejs/*
 !node_modules/requirejs/require.js

--- a/examples/angularjs_require/index.html
+++ b/examples/angularjs_require/index.html
@@ -6,9 +6,6 @@
 		<link rel="stylesheet" href="node_modules/todomvc-common/base.css">
 		<link rel="stylesheet" href="node_modules/todomvc-app-css/index.css">
 		<style>[ng-cloak] { display: none; }</style>
-		<!-- Include angular-loader to allow modules to be loaded in any order. -->
-		<script src="node_modules/angular-loader/angular-loader.js"></script>
 	</head>
 	<body>
 		<section id="todoapp" ng-controller="TodoController">

--- a/examples/angularjs_require/js/app.js
+++ b/examples/angularjs_require/js/app.js
-/*global define*/
+/*global require*/
 'use strict';
-define(['angular'], function (angular) {
+require([
-	return angular.module('todomvc', []);
+	'angular'
+], function (angular) {
+	require([
+		'controllers/todo', 
+		'directives/todoFocus', 
+		'directives/todoEscape',
+		'services/todoStorage'
+	], function (todoCtrl, todoFocusDir, todoEscapeDir, todoStorageSrv) {
+		angular
+			.module('todomvc', [todoFocusDir, todoEscapeDir, todoStorageSrv])
+			.controller('TodoController', todoCtrl);
+		angular.bootstrap(document, ['todomvc']);			
+	});	
 });
--- a/examples/angularjs_require/js/controllers/todo.js
+++ b/examples/angularjs_require/js/controllers/todo.js
@@ -7,9 +7,11 @@
 * - exposes the model to the template and provides event handlers
 */
-define(['app', 'services/todoStorage'], function (app) {
+define([
-	return app.controller('TodoController', ['$scope', '$location', 'todoStorage', 'filterFilter',
+	'angular'
-		function TodoController($scope, $location, todoStorage, filterFilter) {
+], function (angular) {
+	return ['$scope', '$location', 'todoStorage', 'filterFilter',
+		function ($scope, $location, todoStorage, filterFilter) {
 			var todos = $scope.todos = todoStorage.get();
 			$scope.newTodo = '';
@@ -89,5 +91,5 @@ define(['app', 'services/todoStorage'], function (app) {
 				});
 			};
 		}
-	]);
+	];
 });
--- a/examples/angularjs_require/js/directives/todoEscape.js
+++ b/examples/angularjs_require/js/directives/todoEscape.js
 /*global define*/
-define(['app'], function (app) {
+'use strict';
-	'use strict';
-	app.directive('todoEscape', function () {
+/**
+ * Directive that catches the "Escape" key on the element applied to and evaluates the expression it binds to.
+ */
+define([
+	'angular'
+], function (angular) {
+	var moduleName = 'TodoEscapeDirective';
+	angular
+		.module(moduleName, [])
+		.directive('todoEscape', function () {
 			var ESCAPE_KEY = 27;
 			return function (scope, elem, attrs) {
@@ -17,4 +26,5 @@ define(['app'], function (app) {
 				});
 			};
 		});
+	return moduleName;
 });
--- a/examples/angularjs_require/js/directives/todoFocus.js
+++ b/examples/angularjs_require/js/directives/todoFocus.js
 /*global define*/
 'use strict';
 /**
 * Directive that places focus on the element it is applied to when the expression it binds to evaluates to true.
 */
-define(['app'], function (app) {
-	app.directive('todoFocus', ['$timeout', function ($timeout) {
+define([
+	'angular'
+], function (angular) {
+	var moduleName = 'TodoFocusDirective';
+	angular
+		.module(moduleName, [])
+		.directive('todoFocus', ['$timeout', function ($timeout) {
 			return function (scope, elem, attrs) {
 				scope.$watch(attrs.todoFocus, function (newval) {
 					if (newval) {
@@ -15,4 +22,5 @@ define(['app'], function (app) {
 				});
 			};
 		}]);
+	return moduleName;
 });
--- a/examples/angularjs_require/js/main.js
+++ b/examples/angularjs_require/js/main.js
@@ -9,9 +9,6 @@ require.config({
 		angular: {
 			exports: 'angular'
 		}
-	}
+	},
-});
+	deps: ['app']
-require(['angular', 'app', 'controllers/todo', 'directives/todoFocus', 'directives/todoEscape'], function (angular) {
-	angular.bootstrap(document, ['todomvc']);
 });
--- a/examples/angularjs_require/js/services/todoStorage.js
+++ b/examples/angularjs_require/js/services/todoStorage.js
@@ -4,8 +4,14 @@
 /**
 * Services that persists and retrieves TODOs from localStorage.
 */
-define(['app'], function (app) {
-	app.factory('todoStorage', function () {
+define([
+	'angular'
+], function (angular) {
+	var moduleName = 'TodoStorageModule';
+	angular
+		.module(moduleName, [])
+		.factory('todoStorage', function () {
 			var STORAGE_ID = 'todos-angularjs-requirejs';
 			return {
@@ -18,4 +24,5 @@ define(['app'], function (app) {
 				}
 			};
 		});
+	return moduleName;
 });
--- a/examples/angularjs_require/node_modules/angular-loader/angular-loader.js
+++ b/examples/angularjs_require/node_modules/angular-loader/angular-loader.js
--- a/examples/angularjs_require/package.json
+++ b/examples/angularjs_require/package.json
@@ -2,7 +2,6 @@
  "private": true,
  "dependencies": {
    "angular": "^1.3.13",
-    "angular-loader": "^1.3.13",
    "requirejs": "^2.1.15",
    "todomvc-app-css": "^1.0.0",
    "todomvc-common": "^1.0.1"

--- a/examples/angularjs_require/readme.md
+++ b/examples/angularjs_require/readme.md
@@ -34,3 +34,10 @@ Get help from other AngularJS users:
 * [AngularjS on Google +](https://plus.google.com/+AngularJS/posts)
 _If you have other helpful links to share, or find any of the links above no longer work, please [let us know](https://github.com/tastejs/todomvc/issues)._
+## Unit Tests
+To run the test suite, run these commands:
+    npm install
+    npm test
--- a/examples/angularjs_require/test/gruntfile.js
+++ b/examples/angularjs_require/test/gruntfile.js
+'use strict';
+module.exports = function (grunt) {
+	grunt.loadNpmTasks('grunt-contrib-jasmine');
+	grunt.initConfig({
+		jasmine: {
+			unit: {
+				options: {
+					specs: [
+						'unit/**/*Spec.js'
+					],
+					template: require('grunt-template-jasmine-requirejs'),
+					templateOptions: {
+						requireConfigFile: '../js/main.js',
+						requireConfig: {
+							baseUrl: '../js',
+							paths: {
+								jquery: '../test/node_modules/jquery/dist/jquery',
+								'angular-mocks': '../test/node_modules/angular-mocks/angular-mocks'
+							},
+							shim: {
+								'angular-mocks': ['angular']
+							},
+							deps: ['']
+						}
+					},
+					summary: true
+				}
+			}
+		}
+	});
+};
--- a/examples/angularjs_require/test/package.json
+++ b/examples/angularjs_require/test/package.json
+{
+  "private": true,
+  "devDependencies": {
+    "grunt": "^0.4.5",
+    "grunt-contrib-jasmine": "^0.8.1",
+    "grunt-template-jasmine-requirejs": "^0.2.0",
+    "angular-mocks": "^1.3.13",
+    "jquery": "^2.1.4"
+  },
+  "scripts": {
+    "test": "grunt jasmine"
+  }
+}
--- a/examples/angularjs_require/test/unit/directives/todoEscapeSpec.js
+++ b/examples/angularjs_require/test/unit/directives/todoEscapeSpec.js
+define([
+	'directives/todoEscape',
+	'jquery',
+	'angular-mocks'
+], function (todoEscapeDir, jQuery) {
+	'use strict';
+	beforeEach(module(todoEscapeDir));
+	var triggerKeyDown = function (element, keyCode) {
+		var e = jQuery.Event("keydown");
+		e.keyCode = keyCode;
+		element.triggerHandler(e);
+	};
+	describe('todoEscape directive', function () {
+		var scope, compile, browser;
+		beforeEach(inject(function ($rootScope, $compile, $browser) {
+			scope = $rootScope.$new();
+			compile = $compile;
+			browser = $browser;
+		}));
+		it('should evaluate the expression binded to the directive', function () {
+			var someValue = false,
+				el = angular.element('<input todo-escape="doSomething()">');
+			scope.doSomething = function () {
+				someValue = !someValue;
+			};
+			compile(el)(scope);
+			triggerKeyDown(el, 27);
+			expect(someValue).toBe(true);
+		});
+	});
+});
--- a/examples/angularjs_require/test/unit/directives/todoFocusSpec.js
+++ b/examples/angularjs_require/test/unit/directives/todoFocusSpec.js
+define([
+	'directives/todoFocus',
+	'angular-mocks'
+], function (todoFocusDir) {
+	'use strict';
+	beforeEach(module(todoFocusDir));
+	describe('todoFocus directive', function () {
+		var scope, compile, browser;
+		beforeEach(inject(function ($rootScope, $compile, $browser) {
+			scope = $rootScope.$new();
+			compile = $compile;
+			browser = $browser;
+		}));
+		it('should focus on truthy expression', function () {
+			var el = angular.element('<input todo-focus="focus">');
+			scope.focus = false;
+			compile(el)(scope);
+			expect(browser.deferredFns.length).toBe(0);
+			scope.$apply(function () {
+				scope.focus = true;
+			});
+			expect(browser.deferredFns.length).toBe(1);
+		});
+	});
+});