aboutsummaryrefslogtreecommitdiffstats
path: root/src/service/http.js
diff options
context:
space:
mode:
authorVojta Jina2011-08-16 21:24:53 +0200
committerIgor Minar2011-11-30 11:12:14 -0500
commitcd28a2e952efbc2f76ff86b6b7d21fd5e41cec65 (patch)
treea2fd87414cf37838b646550f2aff1dfabf61db63 /src/service/http.js
parent59adadca086853c5de6867ae853f6f27a3af4bbe (diff)
downloadangular.js-cd28a2e952efbc2f76ff86b6b7d21fd5e41cec65.tar.bz2
feat(mocks.$httpBackend): add $httpBackend mock
$httpBackend mock allows: - expecting (asserting) requests - stubbing (responding without asserting) Add empty $httpBackend service (currently just wrapper for $browser.xhr)
Diffstat (limited to 'src/service/http.js')
-rw-r--r--src/service/http.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/service/http.js b/src/service/http.js
index 13621f90..087c3809 100644
--- a/src/service/http.js
+++ b/src/service/http.js
@@ -51,6 +51,7 @@ function transform(data, fns, param) {
/**
* @ngdoc object
* @name angular.module.ng.$http
+ * @requires $httpBacked
* @requires $browser
* @requires $exceptionHandler
* @requires $cacheFactory
@@ -85,8 +86,8 @@ function $HttpProvider() {
}
};
- this.$get = ['$browser', '$exceptionHandler', '$cacheFactory', '$rootScope',
- function($browser, $exceptionHandler, $cacheFactory, $rootScope) {
+ this.$get = ['$httpBackend', '$browser', '$exceptionHandler', '$cacheFactory', '$rootScope',
+ function($httpBackend, $browser, $exceptionHandler, $cacheFactory, $rootScope) {
var cache = $cacheFactory('$http'),
pendingRequestsCount = 0;
@@ -235,7 +236,7 @@ function $HttpProvider() {
/**
* Represents Request object, returned by $http()
*
- * !!! ACCESS CLOSURE VARS: $browser, $config, $log, $rootScope, cache, pendingRequestsCount
+ * !!! ACCESS CLOSURE VARS: $httpBackend, $browser, $config, $log, $rootScope, cache, pendingRequestsCount
*/
function XhrFuture() {
var rawRequest, cfg = {}, callbacks = [],
@@ -243,7 +244,7 @@ function $HttpProvider() {
parsedHeaders;
/**
- * Callback registered to $browser.xhr:
+ * Callback registered to $httpBackend():
* - caches the response if desired
* - calls fireCallbacks()
* - clears the reference to raw request object
@@ -265,7 +266,7 @@ function $HttpProvider() {
* Fire all registered callbacks for given status code
*
* This method when:
- * - serving response from real request ($browser.xhr callback)
+ * - serving response from real request
* - serving response from cache
*
* It does:
@@ -368,7 +369,7 @@ function $HttpProvider() {
fireCallbacks(fromCache[1], fromCache[0]);
});
} else {
- rawRequest = $browser.xhr(cfg.method, cfg.url, data, done, headers, cfg.timeout);
+ rawRequest = $httpBackend(cfg.method, cfg.url, data, done, headers, cfg.timeout);
}
pendingRequestsCount++;