Commit 1940b33d by Jesse White Committed by Daniel Lee

fix: handling of http errors without any data (#8777)

parent d20455ab
......@@ -179,7 +179,7 @@ export class BackendSrv {
}
// for Prometheus
if (!err.data.message && _.isString(err.data.error)) {
if (err.data && !err.data.message && _.isString(err.data.error)) {
err.data.message = err.data.error;
}
......
define([
'app/core/config',
'app/core/services/backend_srv'
], function() {
'use strict';
describe('backend_srv', function() {
var _backendSrv;
var _http;
var _httpBackend;
beforeEach(module('grafana.core'));
beforeEach(module('grafana.services'));
beforeEach(inject(function ($httpBackend, $http, backendSrv) {
_httpBackend = $httpBackend;
_http = $http;
_backendSrv = backendSrv;
}));
describe('when handling errors', function() {
it('should return the http status code', function(done) {
_httpBackend.whenGET('gateway-error').respond(502);
_backendSrv.datasourceRequest({
url: 'gateway-error'
}).catch(function(err) {
expect(err.status).to.be(502);
done();
});
_httpBackend.flush();
});
});
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment