8 files changed, 26 insertions, 14 deletions
diff --git a/js/vendor/angular-mocks/.bower.json b/js/vendor/angular-mocks/.bower.json
index a62603b1f..8733b39f7 100644
--- a/js/vendor/angular-mocks/.bower.json
+++ b/js/vendor/angular-mocks/.bower.json
@@ -1,17 +1,17 @@
 {
   "name": "angular-mocks",
-  "version": "1.4.0-build.3834+sha.75725b4",
+  "version": "1.4.0-build.3861+sha.2c4ffd6",
   "main": "./angular-mocks.js",
   "ignore": [],
   "dependencies": {
-    "angular": "1.4.0-build.3834+sha.75725b4"
+    "angular": "1.4.0-build.3861+sha.2c4ffd6"
   },
   "homepage": "https://github.com/angular/bower-angular-mocks",
-  "_release": "1.4.0-build.3834+sha.75725b4",
+  "_release": "1.4.0-build.3861+sha.2c4ffd6",
   "_resolution": {
     "type": "version",
-    "tag": "v1.4.0-build.3834+sha.75725b4",
-    "commit": "f18c3b4c618b11b79ec273d0d594f921af766239"
+    "tag": "v1.4.0-build.3861+sha.2c4ffd6",
+    "commit": "2bdbc872a7194935080ca6c2ece9d8969813ff70"
   },
   "_source": "git://github.com/angular/bower-angular-mocks.git",
   "_target": "~1.4.*",
diff --git a/js/vendor/angular-mocks/README.md b/js/vendor/angular-mocks/README.md
index 1604ef880..440cce9b7 100644
--- a/js/vendor/angular-mocks/README.md
+++ b/js/vendor/angular-mocks/README.md
@@ -14,10 +14,16 @@ You can install this package either with `npm` or with `bower`.
 npm install angular-mocks
 ```
 
-The mocks are then available at `node_modules/angular-mocks/angular-mocks.js`.
-
-Note that this package is not in CommonJS format, so doing `require('angular-mocks')` will
-return `undefined`.
+You can `require` ngMock modules:
+
+```js
+var angular = require('angular');
+angular.module('myMod', [
+  require('angular-animate'),
+  require('angular-mocks/ngMock')
+  require('angular-mocks/ngAnimateMock')
+]);
+```
 
 ### bower
 
@@ -36,7 +42,7 @@ Documentation is available on the
 
 The MIT License
 
-Copyright (c) 2010-2012 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/js/vendor/angular-mocks/angular-mocks.js b/js/vendor/angular-mocks/angular-mocks.js
index 1320a3717..8adaba81e 100644
--- a/js/vendor/angular-mocks/angular-mocks.js
+++ b/js/vendor/angular-mocks/angular-mocks.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.4.0-build.3834+sha.75725b4
+ * @license AngularJS v1.4.0-build.3861+sha.2c4ffd6
  * (c) 2010-2015 Google, Inc. http://angularjs.org
  * License: MIT
  */
diff --git a/js/vendor/angular-mocks/bower.json b/js/vendor/angular-mocks/bower.json
index 30f1baa2d..623f56bfc 100644
--- a/js/vendor/angular-mocks/bower.json
+++ b/js/vendor/angular-mocks/bower.json
@@ -1,9 +1,9 @@
 {
   "name": "angular-mocks",
-  "version": "1.4.0-build.3834+sha.75725b4",
+  "version": "1.4.0-build.3861+sha.2c4ffd6",
   "main": "./angular-mocks.js",
   "ignore": [],
   "dependencies": {
-    "angular": "1.4.0-build.3834+sha.75725b4"
+    "angular": "1.4.0-build.3861+sha.2c4ffd6"
   }
 }
diff --git a/js/vendor/angular-mocks/ngAnimateMock.js b/js/vendor/angular-mocks/ngAnimateMock.js
new file mode 100644
index 000000000..6f99e62ef
--- /dev/null
+++ b/js/vendor/angular-mocks/ngAnimateMock.js
@@ -0,0 +1,2 @@
+require('./angular-mocks');
+module.exports = 'ngAnimateMock';
diff --git a/js/vendor/angular-mocks/ngMock.js b/js/vendor/angular-mocks/ngMock.js
new file mode 100644
index 000000000..7944de7d5
--- /dev/null
+++ b/js/vendor/angular-mocks/ngMock.js
@@ -0,0 +1,2 @@
+require('./angular-mocks');
+module.exports = 'ngMock';
diff --git a/js/vendor/angular-mocks/ngMockE2E.js b/js/vendor/angular-mocks/ngMockE2E.js
new file mode 100644
index 000000000..fc2e539db
--- /dev/null
+++ b/js/vendor/angular-mocks/ngMockE2E.js
@@ -0,0 +1,2 @@
+require('./angular-mocks');
+module.exports = 'ngMockE2E';
diff --git a/js/vendor/angular-mocks/package.json b/js/vendor/angular-mocks/package.json
index 6525143d8..b5d3cc097 100644
--- a/js/vendor/angular-mocks/package.json
+++ b/js/vendor/angular-mocks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-mocks",
-  "version": "1.4.0-build.3834+sha.75725b4",
+  "version": "1.4.0-build.3861+sha.2c4ffd6",
   "description": "AngularJS mocks for testing",
   "main": "angular-mocks.js",
   "scripts": {