Skip to content

Commit

Permalink
Upgrade Angular version to 1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Atencio committed Mar 18, 2017
1 parent eef0034 commit f1f0ec1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module.exports = function(grunt) {
options: {
specs: 'tests/*.test.js',
vendor: [
'http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.20/angular.js'
'http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.1/angular.js'
],
helpers: [
'tests/setup.js'
Expand Down
2 changes: 1 addition & 1 deletion example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<span id="plugin-result">{{ ctrl.result }}</span>
</div>

<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.20/angular.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.1/angular.min.js"></script>
<script src="app/app.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"scripts": {
"example": "node_modules/.bin/grunt example",
"test": "node_modules/.bin/grunt verify",
"client-test": "node_modules/.bin/grunt client-test",
"webdriver-update": "node node_modules/grunt-protractor-runner/scripts/webdriver-manager-update"
},
"author": "Carlos Atencio",
Expand Down
14 changes: 9 additions & 5 deletions tests/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,13 @@

context.httpMock(expectations, plugins)();

context.__module = angular.module('httpMock').run(function($http){
context.__getHttp = function(){
return $http;
};
});
context.__module = angular.module('httpMock')
.config(['$qProvider', function ($qProvider) {
$qProvider.errorOnUnhandledRejections(false);
}])
.run(function($http){
context.__getHttp = function(){
return $http;
};
});
})(window);

0 comments on commit f1f0ec1

Please sign in to comment.