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

fix: fixed variable srv tests

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-10-19 11:14:02 +02:00
parent 936fe56080
commit b95d64e7a0
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/templating/specs/variable_srv.test.ts
View File

@@ -1,5 +1,6 @@
import '../all';
import { VariableSrv } from '../variable_srv';
import { DashboardModel } from '../../dashboard/dashboard_model';
import moment from 'moment';
import $q from 'q';
@@ -56,10 +57,12 @@ describe('VariableSrv', function(this: any) {
return getVarMockConstructor(ctr, model, ctx);
};
ctx.variableSrv.init({
templating: { list: [] },
updateSubmenuVisibility: () => {},
});
ctx.variableSrv.init(
new DashboardModel({
templating: { list: [] },
updateSubmenuVisibility: () => {},
})
);
scenario.variable = ctx.variableSrv.createVariableFromModel(scenario.variableModel);
ctx.variableSrv.addVariable(scenario.variable);

5
public/app/features/templating/specs/variable_srv_init.test.ts
View File

@@ -2,6 +2,7 @@ import '../all';
import _ from 'lodash';
import { VariableSrv } from '../variable_srv';
import { DashboardModel } from '../../dashboard/dashboard_model';
import $q from 'q';
describe('VariableSrv init', function(this: any) {
@@ -56,9 +57,9 @@ describe('VariableSrv init', function(this: any) {
ctx.variableSrv.datasourceSrv = ctx.datasourceSrv;
ctx.variableSrv.$location.search = () => scenario.urlParams;
ctx.variableSrv.dashboard = {
ctx.variableSrv.dashboard = new DashboardModel({
templating: { list: scenario.variables },
};
});
await ctx.variableSrv.init(ctx.variableSrv.dashboard);

2
public/app/features/templating/variable_srv.ts
View File

@@ -18,7 +18,7 @@ export class VariableSrv {
init(dashboard) {
this.dashboard = dashboard;
this.dashboard.on('time-range-updated', this.onTimeRangeUpdated.bind(this));
this.dashboard.events.on('time-range-updated', this.onTimeRangeUpdated.bind(this));
// create working class models representing variables
this.variables = dashboard.templating.list = dashboard.templating.list.map(this.createVariableFromModel.bind(this));