mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-16 23:30:23 +00:00
parent
44ad61e56c
commit
8e48c4ff6a
2 changed files with 16 additions and 2 deletions
|
|
@ -892,7 +892,7 @@ function $HttpProvider() {
|
|||
|
||||
if (cache) {
|
||||
cachedResp = cache.get(url);
|
||||
if (cachedResp) {
|
||||
if (isDefined(cachedResp)) {
|
||||
if (cachedResp.then) {
|
||||
// cached request has already been sent, but there is no response yet
|
||||
cachedResp.then(removePendingReq, removePendingReq);
|
||||
|
|
@ -912,7 +912,7 @@ function $HttpProvider() {
|
|||
}
|
||||
|
||||
// if we won't have the response in cache, send the request to the backend
|
||||
if (!cachedResp) {
|
||||
if (isUndefined(cachedResp)) {
|
||||
$httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout,
|
||||
config.withCredentials, config.responseType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1248,6 +1248,20 @@ describe('$http', function() {
|
|||
});
|
||||
|
||||
|
||||
it('should allow the cached value to be an empty string', function () {
|
||||
cache.put('/abc', '');
|
||||
|
||||
callback.andCallFake(function (response, status, headers) {
|
||||
expect(response).toBe('');
|
||||
expect(status).toBe(200);
|
||||
});
|
||||
|
||||
$http({method: 'GET', url: '/abc', cache: cache}).success(callback);
|
||||
$rootScope.$digest();
|
||||
expect(callback).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
|
||||
it('should default to status code 200 and empty headers if cache contains a non-array element',
|
||||
inject(function($rootScope) {
|
||||
cache.put('/myurl', 'simple response');
|
||||
|
|
|
|||
Loading…
Reference in a new issue