IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: fix failing test

Browse Source
This commit is contained in:
Erik Sundell 2018-10-10 13:48:41 +02:00
parent 8b4fff8b87
commit fa1d225743
2 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/stackdriver/datasource.ts
View File

@ -198,13 +198,13 @@ export default class StackdriverDatasource {
title: 'Success',
};
} catch (error) {
console.log(error.data.error);
let message = 'Stackdriver: ';
message += error.statusText ? error.statusText + ': ' : '';
if (error.data && error.data.error && error.data.error) {
if (error.data && error.data.error) {
try {
console.log(error.data.error);
const res = JSON.parse(error.data.error);
console.log(res);
message += res.error.code + '. ' + res.error.message;
} catch (err) {
message += error.data.error;

41
public/app/plugins/datasource/stackdriver/specs/datasource.test.ts
View File

@ -53,7 +53,9 @@ describe('StackdriverDataSource', () => {
datasourceRequest: async () =>
Promise.reject({
statusText: 'Bad Request',
data: { error: { code: 400, message: 'Field interval.endTime had an invalid value' } },
data: {
error: JSON.stringify({ error: { code: 400, message: 'Field interval.endTime had an invalid value' } }),
},
}),
};
ds = new StackdriverDataSource(instanceSettings, backendSrv, templateSrv, timeSrv);
@ -67,43 +69,6 @@ describe('StackdriverDataSource', () => {
});
});
describe('when performing getProjects', () => {
describe('and call to resource manager api succeeds', () => {
let ds;
let result;
beforeEach(async () => {
const response = {
projects: [
{
projectNumber: '853996325002',
projectId: 'test-project',
lifecycleState: 'ACTIVE',
name: 'Test Project',
createTime: '2015-06-02T14:16:08.520Z',
parent: {
type: 'organization',
id: '853996325002',
},
},
],
};
const backendSrv = {
async datasourceRequest() {
return Promise.resolve({ status: 200, data: response });
},
};
ds = new StackdriverDataSource(instanceSettings, backendSrv, templateSrv, timeSrv);
result = await ds.getProjects();
});
it('should return successfully', () => {
expect(result.length).toBe(1);
expect(result[0].id).toBe('test-project');
expect(result[0].name).toBe('Test Project');
});
});
});
describe('When performing query', () => {
const options = {
range: {