vendor/assets/javascripts/angular-mocks.js in angularjs-rails-1.0.3 vs vendor/assets/javascripts/angular-mocks.js in angularjs-rails-1.0.4

- old
+ new

@@ -1,8 +1,7 @@ - /** - * @license AngularJS v1.0.3 + * @license AngularJS v1.0.4 * (c) 2010-2012 Google, Inc. http://angularjs.org * License: MIT * * TODO(vojta): wrap whole file into closure during build */ @@ -201,10 +200,34 @@ * * @description * Mock implementation of {@link ng.$exceptionHandler} that rethrows or logs errors passed * into it. See {@link ngMock.$exceptionHandlerProvider $exceptionHandlerProvider} for configuration * information. + * + * + * <pre> + * describe('$exceptionHandlerProvider', function() { + * + * it('should capture log messages and exceptions', function() { + * + * module(function($exceptionHandlerProvider) { + * $exceptionHandlerProvider.mode('log'); + * }); + * + * inject(function($log, $exceptionHandler, $timeout) { + * $timeout(function() { $log.log(1); }); + * $timeout(function() { $log.log(2); throw 'banana peel'; }); + * $timeout(function() { $log.log(3); }); + * expect($exceptionHandler.errors).toEqual([]); + * expect($log.assertEmpty()); + * $timeout.flush(); + * expect($exceptionHandler.errors).toEqual(['banana peel']); + * expect($log.log.logs).toEqual([[1], [2], [3]]); + * }); + * }); + * }); + * </pre> */ angular.mock.$ExceptionHandlerProvider = function() { var handler; @@ -219,12 +242,12 @@ * @param {string} mode Mode of operation, defaults to `rethrow`. * * - `rethrow`: If any errors are are passed into the handler in tests, it typically * means that there is a bug in the application or test, so this mock will * make these tests fail. - * - `log`: Sometimes it is desirable to test that an error is throw, for this case the `log` mode stores the - * error and allows later assertion of it. + * - `log`: Sometimes it is desirable to test that an error is throw, for this case the `log` mode stores an + * array of errors in `$exceptionHandler.errors`, to allow later assertion of them. * See {@link ngMock.$log#assertEmpty assertEmpty()} and * {@link ngMock.$log#reset reset()} */ this.mode = function(mode) { switch(mode) { @@ -560,11 +583,11 @@ })(); /** * @ngdoc function - * @name angular.mock.debug + * @name angular.mock.dump * @description * * *NOTE*: this is not an injectable instance, just a globally available function. * * Method for serializing common angular objects (scope, elements, etc..) into strings, useful for debugging. @@ -743,10 +766,10 @@ }); }; } // testing controller - var $http; + var $httpBackend; beforeEach(inject(function($injector) { $httpBackend = $injector.get('$httpBackend'); // backend definition common for all tests