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

Merge branch 'master' of https://github.com/grafana/grafana

Browse Source
This commit is contained in:
Leandro Piccilli
2016-10-02 16:59:25 +02:00
parent 128de86d49 aa78114440
commit 0000065053
243 changed files with 11663 additions and 4298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
View File

@@ -11,7 +11,7 @@ describe('ElasticDatasource', function() {
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(ctx.providePhase(['templateSrv', 'backendSrv','timeSrv']));
beforeEach(ctx.providePhase(['templateSrv', 'backendSrv']));
beforeEach(angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) {
ctx.$q = $q;
@@ -207,8 +207,9 @@ describe('ElasticDatasource', function() {
ctx.$rootScope.$apply();
});
});
describe('When issuing aggregation query on es5.x', function() {
describe('When issuing aggregation query on es5.x', function() {
var requestOptions, parts, header;
beforeEach(function() {
@@ -279,7 +280,8 @@ describe('ElasticDatasource', function() {
it('should not set terms aggregation size to 0', function() {
expect(body['aggs']['1']['terms'].size).to.not.be(0);
});
});
});