diff options
| author | Misko Hevery | 2010-05-07 12:09:14 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-05-07 12:09:14 -0700 |
| commit | 038a743e6f49c347a38edc0e54dcbb175905a475 (patch) | |
| tree | 8eb10232c94967159175bde5a9209aaf5ba07c67 /test/angular-mocks.js | |
| parent | ac1d02d0658cb74ae3822e364f84809d78cda335 (diff) | |
| download | angular.js-038a743e6f49c347a38edc0e54dcbb175905a475.tar.bz2 | |
xhr bulk fixes
Diffstat (limited to 'test/angular-mocks.js')
| -rw-r--r-- | test/angular-mocks.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/angular-mocks.js b/test/angular-mocks.js index 715b4d75..6ae91596 100644 --- a/test/angular-mocks.js +++ b/test/angular-mocks.js @@ -26,16 +26,17 @@ function MockBrowser() { var self = this, expectations = {}, requests = []; + this.isMock = true; self.url = "http://server"; self.watches = []; self.xhr = function(method, url, data, callback) { - if (isFunction(data)) { + if (angular.isFunction(data)) { callback = data; data = null; } - if (data && isObject(data)) data = angular.toJson(data); - if (data && isString(data)) url += "|" + data; + if (data && angular.isObject(data)) data = angular.toJson(data); + if (data && angular.isString(data)) url += "|" + data; var expect = expectations[method] || {}; var response = expect[url]; if (!response) { @@ -48,8 +49,8 @@ function MockBrowser() { self.xhr.expectations = expectations; self.xhr.requests = requests; self.xhr.expect = function(method, url, data) { - if (data && isObject(data)) data = angular.toJson(data); - if (data && isString(data)) url += "|" + data; + if (data && angular.isObject(data)) data = angular.toJson(data); + if (data && angular.isString(data)) url += "|" + data; var expect = expectations[method] || (expectations[method] = {}); return { respond: function(response) { |
