opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-23 18:52:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-09-03 13:43:58 +02:00
parent 265d5daf57 f8c2b23c86
commit de917dfc4d
55 changed files with 324 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/postgres/specs/datasource.test.ts
View File

@ -13,7 +13,7 @@ describe('PostgreSQLDatasource', function() {
from: moment.utc('2018-04-25 10:00'),
to: moment.utc('2018-04-25 11:00'),
};
const ctx = <any>{
const ctx = {
backendSrv,
timeSrvMock: {
timeRange: () => ({
@ -22,7 +22,7 @@ describe('PostgreSQLDatasource', function() {
raw: raw,
}),
},
};
} as any;
beforeEach(() => {
ctx.ds = new PostgresDatasource(instanceSettings, backendSrv, {}, templateSrv, ctx.timeSrvMock);