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

Pass more tests

Browse Source
This commit is contained in:
Tobias Skarhed 2018-07-24 11:27:53 +02:00
parent bb0af52d34
commit 81c32780b9
2 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/influxdb/query_ctrl.ts
View File

@ -22,7 +22,6 @@ export class InfluxQueryCtrl extends QueryCtrl {
/** @ngInject **/
constructor($scope, $injector, private templateSrv, private $q, private uiSegmentSrv) {
super($scope, $injector);
this.target = this.target;
this.queryModel = new InfluxQuery(this.target, templateSrv, this.panel.scopedVars);
this.queryBuilder = new InfluxQueryBuilder(this.target, this.datasource.database);

110
public/app/plugins/datasource/influxdb/specs/query_ctrl.jest.ts
View File

@ -4,29 +4,28 @@ import 'app/core/services/segment_srv';
// import helpers from 'test/specs/helpers';
import { InfluxQueryCtrl } from '../query_ctrl';
describe('InfluxDBQueryCtrl', function() {
describe('InfluxDBQueryCtrl', () => {
let uiSegmentSrv = {
newPlusButton: () => {},
newKey: key => key,
newKeyValue: key => key,
newSegment: seg => seg,
newSelectMeasurement: () => {
return { value: 'select measurement' };
},
newOperator: op => op,
newFake: () => {},
};
let ctx = <any>{
dataSource: {
metricFindQuery: jest.fn(() => Promise.resolve([])),
},
};
InfluxQueryCtrl.prototype.panelCtrl = {
target: { target: {} },
panel: {
targets: [this.target],
},
dataSource: {},
};
// beforeEach(angularMocks.module('grafana.core'));
// beforeEach(angularMocks.module('grafana.controllers'));
// beforeEach(angularMocks.module('grafana.services'));
// beforeEach(
// angularMocks.module(function($compileProvider) {
// angularMocks.module(($ =>compileProvider) {
// $compileProvider.preAssignBindingsEnabled(true);
// })
// );
@ -56,147 +55,158 @@ describe('InfluxDBQueryCtrl', function() {
// })
// );
beforeEach(() => {
ctx.ctrl = new InfluxQueryCtrl({}, {}, {}, {}, uiSegmentSrv);
beforeEach(async () => {
InfluxQueryCtrl.prototype.datasource = {
metricFindQuery: jest.fn(() => Promise.resolve([])),
};
InfluxQueryCtrl.prototype.panelCtrl = {
panel: {
targets: [InfluxQueryCtrl.target],
},
};
InfluxQueryCtrl.prototype.target = { target: {} };
console.log('creating new instance');
ctx.ctrl = await new InfluxQueryCtrl({}, {}, {}, {}, uiSegmentSrv);
});
describe('init', function() {
it('should init tagSegments', function() {
describe('init', () => {
it('should init tagSegments', () => {
expect(ctx.ctrl.tagSegments.length).toBe(1);
});
it('should init measurementSegment', function() {
it('should init measurementSegment', () => {
expect(ctx.ctrl.measurementSegment.value).toBe('select measurement');
});
});
describe('when first tag segment is updated', function() {
beforeEach(function() {
describe('when first tag segment is updated', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
});
it('should update tag key', function() {
it('should update tag key', () => {
expect(ctx.ctrl.target.tags[0].key).toBe('asd');
expect(ctx.ctrl.tagSegments[0].type).toBe('key');
});
it('should add tagSegments', function() {
it('should add tagSegments', () => {
expect(ctx.ctrl.tagSegments.length).toBe(3);
});
});
describe('when last tag value segment is updated', function() {
beforeEach(function() {
describe('when last tag value segment is updated', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
});
it('should update tag value', function() {
it('should update tag value', () => {
expect(ctx.ctrl.target.tags[0].value).toBe('server1');
});
it('should set tag operator', function() {
it('should set tag operator', () => {
expect(ctx.ctrl.target.tags[0].operator).toBe('=');
});
it('should add plus button for another filter', function() {
it('should add plus button for another filter', () => {
expect(ctx.ctrl.tagSegments[3].fake).toBe(true);
});
});
describe('when last tag value segment is updated to regex', function() {
beforeEach(function() {
describe('when last tag value segment is updated to regex', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
ctx.ctrl.tagSegmentUpdated({ value: '/server.*/', type: 'value' }, 2);
});
it('should update operator', function() {
it('should update operator', () => {
expect(ctx.ctrl.tagSegments[1].value).toBe('=~');
expect(ctx.ctrl.target.tags[0].operator).toBe('=~');
});
});
describe('when second tag key is added', function() {
beforeEach(function() {
describe('when second tag key is added', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
});
it('should update tag key', function() {
it('should update tag key', () => {
expect(ctx.ctrl.target.tags[1].key).toBe('key2');
});
it('should add AND segment', function() {
it('should add AND segment', () => {
expect(ctx.ctrl.tagSegments[3].value).toBe('AND');
});
});
describe('when condition is changed', function() {
beforeEach(function() {
describe('when condition is changed', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
ctx.ctrl.tagSegmentUpdated({ value: 'OR', type: 'condition' }, 3);
});
it('should update tag condition', function() {
it('should update tag condition', () => {
expect(ctx.ctrl.target.tags[1].condition).toBe('OR');
});
it('should update AND segment', function() {
it('should update AND segment', () => {
expect(ctx.ctrl.tagSegments[3].value).toBe('OR');
expect(ctx.ctrl.tagSegments.length).toBe(7);
});
});
describe('when deleting first tag filter after value is selected', function() {
beforeEach(function() {
describe('when deleting first tag filter after value is selected', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
ctx.ctrl.tagSegmentUpdated(ctx.ctrl.removeTagFilterSegment, 0);
});
it('should remove tags', function() {
it('should remove tags', () => {
expect(ctx.ctrl.target.tags.length).toBe(0);
});
it('should remove all segment after 2 and replace with plus button', function() {
it('should remove all segment after 2 and replace with plus button', () => {
expect(ctx.ctrl.tagSegments.length).toBe(1);
expect(ctx.ctrl.tagSegments[0].type).toBe('plus-button');
});
});
describe('when deleting second tag value before second tag value is complete', function() {
beforeEach(function() {
describe('when deleting second tag value before second tag value is complete', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
ctx.ctrl.tagSegmentUpdated(ctx.ctrl.removeTagFilterSegment, 4);
});
it('should remove all segment after 2 and replace with plus button', function() {
it('should remove all segment after 2 and replace with plus button', () => {
expect(ctx.ctrl.tagSegments.length).toBe(4);
expect(ctx.ctrl.tagSegments[3].type).toBe('plus-button');
});
});
describe('when deleting second tag value before second tag value is complete', function() {
beforeEach(function() {
describe('when deleting second tag value before second tag value is complete', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
ctx.ctrl.tagSegmentUpdated(ctx.ctrl.removeTagFilterSegment, 4);
});
it('should remove all segment after 2 and replace with plus button', function() {
it('should remove all segment after 2 and replace with plus button', () => {
expect(ctx.ctrl.tagSegments.length).toBe(4);
expect(ctx.ctrl.tagSegments[3].type).toBe('plus-button');
});
});
describe('when deleting second tag value after second tag filter is complete', function() {
beforeEach(function() {
describe('when deleting second tag value after second tag filter is complete', () => {
beforeEach(() => {
ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
@ -204,7 +214,7 @@ describe('InfluxDBQueryCtrl', function() {
ctx.ctrl.tagSegmentUpdated(ctx.ctrl.removeTagFilterSegment, 4);
});
it('should remove all segment after 2 and replace with plus button', function() {
it('should remove all segment after 2 and replace with plus button', () => {
expect(ctx.ctrl.tagSegments.length).toBe(4);
expect(ctx.ctrl.tagSegments[3].type).toBe('plus-button');
});