Merge pull request saymedia#12 from kshay/master

Override ngAnimate, which dies in server context with no $rootElement

Author: kshay

lib/ngoverrides.js

@@ -13,6 +13,10 @@ function registerModule(context) {
     // depend on it but it makes no sense to run server-defined routes *on* the server.
     context.module('sdr', []);
 
+    // an app that depends on ngAnimate will fail on the absence of $rootElement in unbootstrapped
+    // server context, and animation is not relevant on the server, so we just override it.
+    context.module('ngAnimate', []);
+
     // we depend on ngRoute here to be sure that, even if the application has provided the "real"
     // ngRoute module, we'll always register after it and get to override $route.
     var module = context.module('angularjs-server', ['ng', 'ngRoute']);

package.json

@@ -1,6 +1,6 @@
 {
     "name": "angularjs-server",
-    "version": "0.0.20",
+    "version": "0.0.21",
     "description": "A specialized server for AngularJS applications",
     "author": "Martin Atkins <[email protected]>",
     "keywords": ["angularjs"],

tests/wrap_middleware.js

@@ -3,7 +3,7 @@
 var path = require('path');
 
 exports.testWrapMiddleware = function (test) {
-    test.expect(11);
+    test.expect(13);
     var angularServer = require('../lib/main.js');
 
     var server = angularServer.Server(
@@ -43,6 +43,16 @@ exports.testWrapMiddleware = function (test) {
                 'angularjs-server module registered'
             );
 
+            test.ok(
+                angular.modulesRegistered.indexOf('ngRoute') !== -1,
+                'fake ngRoute module registered'
+            );
+
+            test.ok(
+                angular.modulesRegistered.indexOf('ngAnimate') !== -1,
+                'fake ngAnimate module registered'
+            );
+
             test.ok(
                 angular.requestsRegistered.length === 1,
                 'nodejs request was registered exactly once'