diff options
Diffstat (limited to 'libs/bower_components/angular-mocks')
-rw-r--r-- | libs/bower_components/angular-mocks/.bower.json | 10 | ||||
-rw-r--r-- | libs/bower_components/angular-mocks/LICENSE.md | 21 | ||||
-rw-r--r-- | libs/bower_components/angular-mocks/README.md | 2 | ||||
-rw-r--r-- | libs/bower_components/angular-mocks/angular-mocks.js | 8 | ||||
-rw-r--r-- | libs/bower_components/angular-mocks/bower.json | 4 | ||||
-rw-r--r-- | libs/bower_components/angular-mocks/package.json | 11 |
6 files changed, 45 insertions, 11 deletions
diff --git a/libs/bower_components/angular-mocks/.bower.json b/libs/bower_components/angular-mocks/.bower.json index 82b2c2a7e4..0fdbcc9a88 100644 --- a/libs/bower_components/angular-mocks/.bower.json +++ b/libs/bower_components/angular-mocks/.bower.json @@ -1,18 +1,18 @@ { "name": "angular-mocks", - "version": "1.4.10", + "version": "1.4.14", "license": "MIT", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.4.10" + "angular": "1.4.14" }, "homepage": "https://github.com/angular/bower-angular-mocks", - "_release": "1.4.10", + "_release": "1.4.14", "_resolution": { "type": "version", - "tag": "v1.4.10", - "commit": "f5bcaf2b32c76f778704b7e92f31d661c24f3364" + "tag": "v1.4.14", + "commit": "d6d76294fbc8ee9e5d5b581968b775910b4e67d0" }, "_source": "https://github.com/angular/bower-angular-mocks.git", "_target": "~1.4.0", diff --git a/libs/bower_components/angular-mocks/LICENSE.md b/libs/bower_components/angular-mocks/LICENSE.md new file mode 100644 index 0000000000..2c395eef1b --- /dev/null +++ b/libs/bower_components/angular-mocks/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 Angular + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/libs/bower_components/angular-mocks/README.md b/libs/bower_components/angular-mocks/README.md index 440cce9b78..61b9d8c083 100644 --- a/libs/bower_components/angular-mocks/README.md +++ b/libs/bower_components/angular-mocks/README.md @@ -20,7 +20,7 @@ You can `require` ngMock modules: var angular = require('angular'); angular.module('myMod', [ require('angular-animate'), - require('angular-mocks/ngMock') + require('angular-mocks/ngMock'), require('angular-mocks/ngAnimateMock') ]); ``` diff --git a/libs/bower_components/angular-mocks/angular-mocks.js b/libs/bower_components/angular-mocks/angular-mocks.js index ab2ba68318..fc82ed866d 100644 --- a/libs/bower_components/angular-mocks/angular-mocks.js +++ b/libs/bower_components/angular-mocks/angular-mocks.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.4.10 + * @license AngularJS v1.4.14 * (c) 2010-2015 Google, Inc. http://angularjs.org * License: MIT */ @@ -2487,6 +2487,12 @@ if (window.jasmine || window.mocha) { window.inject = angular.mock.inject = function() { var blockFns = Array.prototype.slice.call(arguments, 0); var errorForStack = new Error('Declaration Location'); + // IE10+ and PhanthomJS do not set stack trace information, until the error is thrown + if (!errorForStack.stack) { + try { + throw errorForStack; + } catch (e) {} + } return isSpecRunning() ? workFn.call(currentSpec) : workFn; ///////////////////// function workFn() { diff --git a/libs/bower_components/angular-mocks/bower.json b/libs/bower_components/angular-mocks/bower.json index f23af5a8f4..1266add253 100644 --- a/libs/bower_components/angular-mocks/bower.json +++ b/libs/bower_components/angular-mocks/bower.json @@ -1,10 +1,10 @@ { "name": "angular-mocks", - "version": "1.4.10", + "version": "1.4.14", "license": "MIT", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.4.10" + "angular": "1.4.14" } } diff --git a/libs/bower_components/angular-mocks/package.json b/libs/bower_components/angular-mocks/package.json index 291cf64a10..0fb4f1d58e 100644 --- a/libs/bower_components/angular-mocks/package.json +++ b/libs/bower_components/angular-mocks/package.json @@ -1,6 +1,6 @@ { "name": "angular-mocks", - "version": "1.4.10", + "version": "1.4.14", "description": "AngularJS mocks for testing", "main": "angular-mocks.js", "scripts": { @@ -23,5 +23,12 @@ "bugs": { "url": "https://github.com/angular/angular.js/issues" }, - "homepage": "http://angularjs.org" + "homepage": "http://angularjs.org", + "jspm": { + "shim": { + "angular-mocks": { + "deps": ["angular"] + } + } + } } |