Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: fix tests.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-11-13 19:02:37 +03:00
parent 6e0f59cd69
commit 4dc4e3b8ea
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/datasource-zabbix/datasource.js
View File

@@ -373,7 +373,7 @@ class ZabbixAPIDatasource {
}); });
target.textFilter = this.replaceTemplateVars(target.textFilter, options.scopedVars); target.textFilter = this.replaceTemplateVars(target.textFilter, options.scopedVars);
target.functions.forEach(func => { _.forEach(target.functions, func => {
func.params = func.params.map(param => { func.params = func.params.map(param => {
if (typeof param === 'number') { if (typeof param === 'number') {
return +this.templateSrv.replace(param.toString(), options.scopedVars); return +this.templateSrv.replace(param.toString(), options.scopedVars);

22
src/datasource-zabbix/specs/datasource_specs.js
View File

@@ -19,12 +19,9 @@ describe('ZabbixDatasource', () => {
}; };
ctx.templateSrv = {}; ctx.templateSrv = {};
ctx.alertSrv = {}; ctx.alertSrv = {};
ctx.zabbixAPIService = () => {}; ctx.zabbix = () => {};
ctx.ZabbixCachingProxy = () => {};
ctx.queryBuilder = () => {};
ctx.ds = new Datasource(ctx.instanceSettings, ctx.templateSrv, ctx.alertSrv, ctx.ds = new Datasource(ctx.instanceSettings, ctx.templateSrv, ctx.alertSrv, ctx.zabbix);
ctx.zabbixAPIService, ctx.ZabbixCachingProxy, ctx.queryBuilder);
}); });
describe('When querying data', () => { describe('When querying data', () => {
@@ -143,10 +140,7 @@ describe('ZabbixDatasource', () => {
describe('When invoking metricFindQuery()', () => { describe('When invoking metricFindQuery()', () => {
beforeEach(() => { beforeEach(() => {
ctx.ds.replaceTemplateVars = (str) => str; ctx.ds.replaceTemplateVars = (str) => str;
ctx.ds.zabbixCache = { ctx.ds.zabbix = {
getGroups: () => Q.when([])
};
ctx.ds.queryBuilder = {
getGroups: () => Q.when([]), getGroups: () => Q.when([]),
getHosts: () => Q.when([]), getHosts: () => Q.when([]),
getApps: () => Q.when([]), getApps: () => Q.when([]),
@@ -162,7 +156,7 @@ describe('ZabbixDatasource', () => {
{query: 'Back*', expect: 'Back*'} {query: 'Back*', expect: 'Back*'}
]; ];
let getGroups = sinon.spy(ctx.ds.zabbixCache, 'getGroups'); let getGroups = sinon.spy(ctx.ds.zabbix, 'getGroups');
for (const test of tests) { for (const test of tests) {
ctx.ds.metricFindQuery(test.query); ctx.ds.metricFindQuery(test.query);
expect(getGroups).to.have.been.calledWith(test.expect); expect(getGroups).to.have.been.calledWith(test.expect);
@@ -179,7 +173,7 @@ describe('ZabbixDatasource', () => {
{query: 'Back*.', expect: 'Back*'} {query: 'Back*.', expect: 'Back*'}
]; ];
let getHosts = sinon.spy(ctx.ds.queryBuilder, 'getHosts'); let getHosts = sinon.spy(ctx.ds.zabbix, 'getHosts');
for (const test of tests) { for (const test of tests) {
ctx.ds.metricFindQuery(test.query); ctx.ds.metricFindQuery(test.query);
expect(getHosts).to.have.been.calledWith(test.expect); expect(getHosts).to.have.been.calledWith(test.expect);
@@ -196,7 +190,7 @@ describe('ZabbixDatasource', () => {
{query: 'Back*.*.', expect: ['Back*', '/.*/']} {query: 'Back*.*.', expect: ['Back*', '/.*/']}
]; ];
let getApps = sinon.spy(ctx.ds.queryBuilder, 'getApps'); let getApps = sinon.spy(ctx.ds.zabbix, 'getApps');
for (const test of tests) { for (const test of tests) {
ctx.ds.metricFindQuery(test.query); ctx.ds.metricFindQuery(test.query);
expect(getApps).to.have.been.calledWith(test.expect[0], test.expect[1]); expect(getApps).to.have.been.calledWith(test.expect[0], test.expect[1]);
@@ -213,7 +207,7 @@ describe('ZabbixDatasource', () => {
{query: 'Back*.*.cpu.*', expect: ['Back*', '/.*/', 'cpu']} {query: 'Back*.*.cpu.*', expect: ['Back*', '/.*/', 'cpu']}
]; ];
let getItems = sinon.spy(ctx.ds.queryBuilder, 'getItems'); let getItems = sinon.spy(ctx.ds.zabbix, 'getItems');
for (const test of tests) { for (const test of tests) {
ctx.ds.metricFindQuery(test.query); ctx.ds.metricFindQuery(test.query);
expect(getItems) expect(getItems)
@@ -226,7 +220,7 @@ describe('ZabbixDatasource', () => {
it('should invoke method with proper arguments', (done) => { it('should invoke method with proper arguments', (done) => {
let query = '*.*'; let query = '*.*';
let getHosts = sinon.spy(ctx.ds.queryBuilder, 'getHosts'); let getHosts = sinon.spy(ctx.ds.zabbix, 'getHosts');
ctx.ds.metricFindQuery(query); ctx.ds.metricFindQuery(query);
expect(getHosts).to.have.been.calledWith('/.*/'); expect(getHosts).to.have.been.calledWith('/.*/');
done(); done();