feature($exceptionHandler): $exceptionHandler now supports var_args

2 files changed, 14 insertions, 6 deletions

diff --git a/src/angular-mocks.js b/src/angular-mocks.js
index 516259b8..0645322b 100644
--- a/src/angular-mocks.js
+++ b/src/angular-mocks.js
@@ -249,8 +249,12 @@ angular.mock.$ExceptionHandlerProvider = function() {
       case 'log':
         var errors = [];
         handler = function(e) {
-          errors.push(e);
-        };
+          if (arguments.length == 1) {
+            errors.push(e);
+          } else {
+            errors.push([].slice.call(arguments, 0));
+          }
+        }
         handler.errors = errors;
         break;
       default:
diff --git a/src/service/exceptionHandler.js b/src/service/exceptionHandler.js
index 6d680b04..26ea5845 100644
--- a/src/service/exceptionHandler.js
+++ b/src/service/exceptionHandler.js
@@ -10,13 +10,17 @@
  * The default implementation simply delegates to `$log.error` which logs it into
  * the browser console.
  *
- * In unit tests, if `angular-mocks.js` is loaded, this service is overriden by
+ * In unit tests, if `angular-mocks.js` is loaded, this service is overridden by
  * {@link angular.module.ngMock.$exceptionHandler mock $exceptionHandler}
+ *
+ * @param {Error} exception Exception associated with the error.
+ * @param {string=} cause optional information about the context in which
+ *       the error was thrown.
  */
-function $ExceptionHandlerProvider(){
+function $ExceptionHandlerProvider() {
   this.$get = ['$log', function($log){
-    return function(e) {
-      $log.error(e);
+    return function(exception, cause) {
+      $log.error.apply($log, arguments);
     };
   }];
 }