Merge branch 'master' of github.com:angular/angular.js into future

1 files changed, 1 insertions, 0 deletions

diff --git a/test/angular-mocks.js b/test/angular-mocks.js
index 8838b2cd..bac2e800 100644
--- a/test/angular-mocks.js
+++ b/test/angular-mocks.js
@@ -66,6 +66,7 @@ function MockBrowser() {
   self.xhr.expectPOST   = angular.bind(self, self.xhr.expect, 'POST');
   self.xhr.expectDELETE = angular.bind(self, self.xhr.expect, 'DELETE');
   self.xhr.expectPUT    = angular.bind(self, self.xhr.expect, 'PUT');
+  self.xhr.expectJSON   = angular.bind(self, self.xhr.expect, 'JSON');
   self.xhr.flush = function() {
     while(requests.length) {
       requests.pop()();