angular-mocks.js in angularjs-rails-1.3.6

- old
+ new

@@ -1,7 +1,7 @@
 /**
- * @license AngularJS v1.3.4
+ * @license AngularJS v1.3.36
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
 (function(window, angular, undefined) {
 
@@ -1117,11 +1117,11 @@
        });
     });
    ```
  */
 angular.mock.$HttpBackendProvider = function() {
-  this.$get = ['$rootScope', createHttpBackendMock];
+  this.$get = ['$rootScope', '$timeout', createHttpBackendMock];
 };
 
 /**
  * General factory function for $httpBackend mock.
  * Returns instance for unit testing (when no arguments specified):
@@ -1134,11 +1134,11 @@
  *
  * @param {Object=} $delegate Real $httpBackend instance (allow passing through if specified)
  * @param {Object=} $browser Auto-flushing enabled if specified
  * @return {Object} Instance of $httpBackend mock
  */
-function createHttpBackendMock($rootScope, $delegate, $browser) {
+function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
   var definitions = [],
       expectations = [],
       responses = [],
       responsesPush = angular.bind(responses, responses.push),
       copy = angular.copy;
@@ -1147,11 +1147,11 @@
     if (angular.isFunction(status)) return status;
 
     return function() {
       return angular.isNumber(status)
           ? [status, data, headers, statusText]
-          : [200, status, data];
+          : [200, status, data, headers];
     };
   }
 
   // TODO(vojta): change params to: method, url, data, headers, callback
   function $httpBackend(method, url, data, callback, headers, timeout, withCredentials) {
@@ -1164,11 +1164,13 @@
           ? data
           : angular.toJson(data);
     }
 
     function wrapResponse(wrapped) {
-      if (!$browser && timeout && timeout.then) timeout.then(handleTimeout);
+      if (!$browser && timeout) {
+        timeout.then ? timeout.then(handleTimeout) : $timeout(handleTimeout, timeout);
+      }
 
       return handleResponse;
 
       function handleResponse() {
         var response = wrapped.response(method, url, data, headers);
@@ -2038,11 +2040,11 @@
  *   control how a matched request is handled. You can save this object for later use and invoke
  *   `respond` or `passThrough` again in order to change how a matched request is handled.
  */
 angular.mock.e2e = {};
 angular.mock.e2e.$httpBackendDecorator =
-  ['$rootScope', '$delegate', '$browser', createHttpBackendMock];
+  ['$rootScope', '$timeout', '$delegate', '$browser', createHttpBackendMock];
 
 
 /**
  * @ngdoc type
  * @name $rootScope.Scope
@@ -2052,11 +2054,11 @@
  * methods are automatically available on any {@link ng.$rootScope.Scope Scope} instance when
  * `ngMock` module is loaded.
  *
  * In addition to all the regular `Scope` methods, the following helper methods are available:
  */
-angular.mock.$RootScopeDecorator = function($delegate) {
+angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) {
 
   var $rootScopePrototype = Object.getPrototypeOf($delegate);
 
   $rootScopePrototype.$countChildScopes = countChildScopes;
   $rootScopePrototype.$countWatchers = countWatchers;
@@ -2124,10 +2126,10 @@
       }
     }
 
     return count;
   }
-};
+}];
 
 
 if (window.jasmine || window.mocha) {
 
   var currentSpec = null,