Skip to content

Commit

Permalink
Update to angular 1.0.7.
Browse files Browse the repository at this point in the history
  • Loading branch information
dylanfprice committed Jul 20, 2013
1 parent d14e616 commit 03ab919
Show file tree
Hide file tree
Showing 4 changed files with 755 additions and 502 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -27,7 +27,7 @@ Include the required libraries
```html
<script src="//maps.googleapis.com/maps/api/js?sensor=false"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.7/angular.min.js"></script>
<script src="//dylanfprice.github.com/angular-gm/angular-gm-0.1.0.min.js"></script>
```

Expand Down
50 changes: 37 additions & 13 deletions test/lib/angular/angular-mocks.js
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.0.5
* @license AngularJS v1.0.7
* (c) 2010-2012 Google, Inc. http://angularjs.org
* License: MIT
*
Expand Down Expand Up @@ -241,10 +241,10 @@ angular.mock.$ExceptionHandlerProvider = function() {
*
* @param {string} mode Mode of operation, defaults to `rethrow`.
*
* - `rethrow`: If any errors are are passed into the handler in tests, it typically
* - `rethrow`: If any errors 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 an
* - `log`: Sometimes it is desirable to test that an error is thrown, 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()}
Expand Down Expand Up @@ -322,7 +322,13 @@ angular.mock.$LogProvider = function() {
* @propertyOf ngMock.$log
*
* @description
* Array of logged messages.
* Array of messages logged using {@link ngMock.$log#log}.
*
* @example
* <pre>
* $log.log('Some Log');
* var first = $log.log.logs.unshift();
* </pre>
*/
$log.log.logs = [];
/**
Expand All @@ -331,7 +337,13 @@ angular.mock.$LogProvider = function() {
* @propertyOf ngMock.$log
*
* @description
* Array of logged messages.
* Array of messages logged using {@link ngMock.$log#warn}.
*
* @example
* <pre>
* $log.warn('Some Warning');
* var first = $log.warn.logs.unshift();
* </pre>
*/
$log.warn.logs = [];
/**
Expand All @@ -340,7 +352,13 @@ angular.mock.$LogProvider = function() {
* @propertyOf ngMock.$log
*
* @description
* Array of logged messages.
* Array of messages logged using {@link ngMock.$log#info}.
*
* @example
* <pre>
* $log.info('Some Info');
* var first = $log.info.logs.unshift();
* </pre>
*/
$log.info.logs = [];
/**
Expand All @@ -349,7 +367,13 @@ angular.mock.$LogProvider = function() {
* @propertyOf ngMock.$log
*
* @description
* Array of logged messages.
* Array of messages logged using {@link ngMock.$log#error}.
*
* @example
* <pre>
* $log.log('Some Error');
* var first = $log.error.logs.unshift();
* </pre>
*/
$log.error.logs = [];
};
Expand Down Expand Up @@ -430,7 +454,7 @@ angular.mock.$LogProvider = function() {
*
* *NOTE*: this is not an injectable instance, just a globally available mock class of `Date`.
*
* Mock of the Date type which has its timezone specified via constroctor arg.
* Mock of the Date type which has its timezone specified via constructor arg.
*
* The main purpose is to create Date-like instances with timezone fixed to the specified timezone
* offset, so that we can test code that depends on local timezone settings without dependency on
Expand Down Expand Up @@ -653,10 +677,10 @@ angular.mock.dump = function(object) {
* @ngdoc object
* @name ngMock.$httpBackend
* @description
* Fake HTTP backend implementation suitable for unit testing application that use the
* Fake HTTP backend implementation suitable for unit testing applications that use the
* {@link ng.$http $http service}.
*
* *Note*: For fake http backend implementation suitable for end-to-end testing or backend-less
* *Note*: For fake HTTP backend implementation suitable for end-to-end testing or backend-less
* development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}.
*
* During unit testing, we want our unit tests to run quickly and have no external dependencies so
Expand Down Expand Up @@ -1653,7 +1677,7 @@ window.jasmine && (function(window) {
* @name angular.mock.module
* @description
*
* *NOTE*: This is function is also published on window for easy access.<br>
* *NOTE*: This function is also published on window for easy access.<br>
* *NOTE*: Only available with {@link http://pivotal.github.com/jasmine/ jasmine}.
*
* This function registers a module configuration code. It collects the configuration information
Expand Down Expand Up @@ -1687,7 +1711,7 @@ window.jasmine && (function(window) {
* @name angular.mock.inject
* @description
*
* *NOTE*: This is function is also published on window for easy access.<br>
* *NOTE*: This function is also published on window for easy access.<br>
* *NOTE*: Only available with {@link http://pivotal.github.com/jasmine/ jasmine}.
*
* The inject function wraps a function into an injectable function. The inject() creates new
Expand Down Expand Up @@ -1753,7 +1777,7 @@ window.jasmine && (function(window) {
try {
injector.invoke(blockFns[i] || angular.noop, this);
} catch (e) {
if(e.stack) e.stack += '\n' + errorForStack.stack;
if(e.stack && errorForStack) e.stack += '\n' + errorForStack.stack;
throw e;
} finally {
errorForStack = null;
Expand Down

0 comments on commit 03ab919

Please sign in to comment.