opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-21 22:13:20 +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-08-27 11:23:55 +02:00
parent da8696ed95 e1beaaa0f7
commit 7177f19436
289 changed files with 2434 additions and 2421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,17 +3,17 @@ import { PostgresDatasource } from '../datasource';
import { CustomVariable } from 'app/features/templating/custom_variable';
describe('PostgreSQLDatasource', function() {
let instanceSettings = { name: 'postgresql' };
const instanceSettings = { name: 'postgresql' };
let backendSrv = {};
let templateSrv = {
const backendSrv = {};
const templateSrv = {
replace: jest.fn(text => text),
};
const raw = {
from: moment.utc('2018-04-25 10:00'),
to: moment.utc('2018-04-25 11:00'),
};
let ctx = <any>{
const ctx = <any>{
backendSrv,
timeSrvMock: {
timeRange: () => ({