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

Use fetch API in InfluxDB data source (#28555)

Browse Source 
* Use fetch API in InfluxDB data source

* Review comments
This commit is contained in:
Dominik Prokop
2020-10-27 11:35:59 +01:00
committed by GitHub
parent f13c267f1c
commit d1ed163fc6
2 changed files with 131 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
public/app/plugins/datasource/influxdb/specs/datasource.test.ts
View File

@@ -2,6 +2,8 @@ import InfluxDatasource from '../datasource';
import { TemplateSrvStub } from 'test/specs/helpers';
import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
import { of } from 'rxjs';
import { FetchResponse } from '@grafana/runtime';
//@ts-ignore
const templateSrv = new TemplateSrvStub();
@@ -16,7 +18,7 @@ describe('InfluxDataSource', () => {
instanceSettings: { url: 'url', name: 'influxDb', jsonData: { httpMode: 'GET' } },
};
const datasourceRequestMock = jest.spyOn(backendSrv, 'datasourceRequest');
const fetchMock = jest.spyOn(backendSrv, 'fetch');
beforeEach(() => {
jest.clearAllMocks();
@@ -35,12 +37,13 @@ describe('InfluxDataSource', () => {
let requestQuery: any, requestMethod: any, requestData: any, response: any;
beforeEach(async () => {
datasourceRequestMock.mockImplementation((req: any) => {
fetchMock.mockImplementation((req: any) => {
requestMethod = req.method;
requestQuery = req.params.q;
requestData = req.data;
return Promise.resolve({
return of({
data: {
status: 'success',
results: [
{
series: [
@@ -53,7 +56,7 @@ describe('InfluxDataSource', () => {
},
],
},
});
} as FetchResponse);
});
response = await ctx.ds.metricFindQuery(query, queryOptions);
@@ -96,8 +99,8 @@ describe('InfluxDataSource', () => {
};
it('throws an error', async () => {
datasourceRequestMock.mockImplementation((req: any) => {
return Promise.resolve({
fetchMock.mockImplementation((req: any) => {
return of({
data: {
results: [
{
@@ -105,7 +108,7 @@ describe('InfluxDataSource', () => {
},
],
},
});
} as FetchResponse);
});
try {
@@ -132,23 +135,25 @@ describe('InfluxDataSource', () => {
let requestMethod: any, requestQueryParameter: any, queryEncoded: any, requestQuery: any;
beforeEach(async () => {
datasourceRequestMock.mockImplementation((req: any) => {
fetchMock.mockImplementation((req: any) => {
requestMethod = req.method;
requestQueryParameter = req.params;
requestQuery = req.data;
return Promise.resolve({
results: [
{
series: [
{
name: 'measurement',
columns: ['max'],
values: [[1]],
},
],
},
],
});
return of({
data: {
results: [
{
series: [
{
name: 'measurement',
columns: ['max'],
values: [[1]],
},
],
},
],
},
} as FetchResponse);
});
queryEncoded = await ctx.ds.serializeParams({ q: query });