Bower modules updated.

This commit is contained in:
Andreas Baldeau 2014-08-10 12:02:48 +02:00
commit 1ee78ab657
140 changed files with 7098 additions and 3713 deletions

View file

@ -1,18 +1,18 @@
{
"name": "angular-mocks",
"version": "1.2.16",
"version": "1.2.21",
"main": "./angular-mocks.js",
"dependencies": {
"angular": "1.2.16"
"angular": "1.2.21"
},
"homepage": "https://github.com/angular/bower-angular-mocks",
"_release": "1.2.16",
"_release": "1.2.21",
"_resolution": {
"type": "version",
"tag": "v1.2.16",
"commit": "e429a011d88c402430329449500f352751d1a137"
"tag": "v1.2.21",
"commit": "ab33e90eaec5bb2c96126e808ae9f44cf59b7205"
},
"_source": "git://github.com/angular/bower-angular-mocks.git",
"_target": "1.2.16",
"_target": "1.2.21",
"_originalSource": "angular-mocks"
}

View file

@ -1,5 +1,5 @@
/**
* @license AngularJS v1.2.16
* @license AngularJS v1.2.21
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
@ -462,7 +462,7 @@ angular.mock.$IntervalProvider = function() {
iteration = 0,
skipApply = (angular.isDefined(invokeApply) && !invokeApply);
count = (angular.isDefined(count)) ? count : 0,
count = (angular.isDefined(count)) ? count : 0;
promise.then(null, null, fn);
promise.$$intervalId = nextRepeatId;
@ -900,7 +900,7 @@ angular.mock.dump = function(object) {
* When an Angular application needs some data from a server, it calls the $http service, which
* sends the request to a real server using $httpBackend service. With dependency injection, it is
* easy to inject $httpBackend mock (which has the same API as $httpBackend) and use it to verify
* the requests and respond with some testing data without sending a request to real server.
* the requests and respond with some testing data without sending a request to a real server.
*
* There are two ways to specify what test data should be returned as http responses by the mock
* backend when the code under test makes http requests:
@ -1722,11 +1722,12 @@ angular.mock.$RootElementProvider = function() {
/**
* @ngdoc module
* @name ngMock
* @packageName angular-mocks
* @description
*
* # ngMock
*
* The `ngMock` module providers support to inject and mock Angular services into unit tests.
* The `ngMock` module provides support to inject and mock Angular services into unit tests.
* In addition, ngMock also extends various core ng services such that they can be
* inspected and controlled in a synchronous manner within test code.
*
@ -1751,6 +1752,7 @@ angular.module('ngMock', ['ng']).provider({
* @ngdoc module
* @name ngMockE2E
* @module ngMockE2E
* @packageName angular-mocks
* @description
*
* The `ngMockE2E` is an angular module which contains mocks suitable for end-to-end testing.
@ -1800,7 +1802,9 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {
*
* // adds a new phone to the phones array
* $httpBackend.whenPOST('/phones').respond(function(method, url, data) {
* phones.push(angular.fromJson(data));
* var phone = angular.fromJson(data);
* phones.push(phone);
* return [200, phone, {}];
* });
* $httpBackend.whenGET(/^\/templates\//).passThrough();
* //...
@ -1956,13 +1960,19 @@ if(window.jasmine || window.mocha) {
};
beforeEach(function() {
(window.beforeEach || window.setup)(function() {
currentSpec = this;
});
afterEach(function() {
(window.afterEach || window.teardown)(function() {
var injector = currentSpec.$injector;
angular.forEach(currentSpec.$modules, function(module) {
if (module && module.$$hashKey) {
module.$$hashKey = undefined;
}
});
currentSpec.$injector = null;
currentSpec.$modules = null;
currentSpec = null;
@ -2002,7 +2012,7 @@ if(window.jasmine || window.mocha) {
* @param {...(string|Function|Object)} fns any number of modules which are represented as string
* aliases or as anonymous module initialization functions. The modules are used to
* configure the injector. The 'ng' and 'ngMock' modules are automatically loaded. If an
* object literal is passed they will be register as values in the module, the key being
* object literal is passed they will be registered as values in the module, the key being
* the module name and the value being what is returned.
*/
window.module = angular.mock.module = function() {

View file

@ -1,8 +1,8 @@
{
"name": "angular-mocks",
"version": "1.2.16",
"version": "1.2.21",
"main": "./angular-mocks.js",
"dependencies": {
"angular": "1.2.16"
"angular": "1.2.21"
}
}