From 6440d884db0cac128029cdce68f6ec8bbe1bb9e0 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 6 Dec 2016 14:17:03 +0100 Subject: [PATCH] elastic: make sure old tests are for es2 --- .../datasource/elasticsearch/specs/datasource_specs.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts index 6689b78c0b4..0a93844e968 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts @@ -28,7 +28,7 @@ describe('ElasticDatasource', function() { describe('When testing datasource with index pattern', function() { beforeEach(function() { - createDatasource({url: 'http://es.com', index: '[asd-]YYYY.MM.DD', jsonData: {interval: 'Daily'}}); + createDatasource({url: 'http://es.com', index: '[asd-]YYYY.MM.DD', jsonData: {interval: 'Daily', esVersion: '2'}}); }); it('should translate index pattern to current day', function() { @@ -50,7 +50,7 @@ describe('ElasticDatasource', function() { var requestOptions, parts, header; beforeEach(function() { - createDatasource({url: 'http://es.com', index: '[asd-]YYYY.MM.DD', jsonData: {interval: 'Daily'}}); + createDatasource({url: 'http://es.com', index: '[asd-]YYYY.MM.DD', jsonData: {interval: 'Daily', esVersion: '2'}}); ctx.backendSrv.datasourceRequest = function(options) { requestOptions = options; @@ -85,7 +85,7 @@ describe('ElasticDatasource', function() { var requestOptions, parts, header; beforeEach(function() { - createDatasource({url: 'http://es.com', index: 'test'}); + createDatasource({url: 'http://es.com', index: 'test', jsonData: {esVersion: '2'}}); ctx.backendSrv.datasourceRequest = function(options) { requestOptions = options;