Skip to content

Commit f1f0ec1

Browse files
author
Carlos Atencio
committed
Upgrade Angular version to 1.6.1
1 parent eef0034 commit f1f0ec1

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module.exports = function(grunt) {
5050
options: {
5151
specs: 'tests/*.test.js',
5252
vendor: [
53-
'http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.20/angular.js'
53+
'http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.1/angular.js'
5454
],
5555
helpers: [
5656
'tests/setup.js'

example/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<span id="plugin-result">{{ ctrl.result }}</span>
7878
</div>
7979

80-
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.20/angular.min.js"></script>
80+
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.1/angular.min.js"></script>
8181
<script src="app/app.js"></script>
8282
</body>
8383
</html>

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"scripts": {
77
"example": "node_modules/.bin/grunt example",
88
"test": "node_modules/.bin/grunt verify",
9+
"client-test": "node_modules/.bin/grunt client-test",
910
"webdriver-update": "node node_modules/grunt-protractor-runner/scripts/webdriver-manager-update"
1011
},
1112
"author": "Carlos Atencio",

tests/setup.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,13 @@
306306

307307
context.httpMock(expectations, plugins)();
308308

309-
context.__module = angular.module('httpMock').run(function($http){
310-
context.__getHttp = function(){
311-
return $http;
312-
};
313-
});
309+
context.__module = angular.module('httpMock')
310+
.config(['$qProvider', function ($qProvider) {
311+
$qProvider.errorOnUnhandledRejections(false);
312+
}])
313+
.run(function($http){
314+
context.__getHttp = function(){
315+
return $http;
316+
};
317+
});
314318
})(window);

0 commit comments

Comments
 (0)