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 pull request #4287 from grafana/raintank-issue4283

Browse Source 
refactor how template vars are updated. fixes #4283
This commit is contained in:
Torkel Ödegaard
2016-03-08 11:33:37 +01:00
parent 17006b4539 6fac471415
commit 3af4b1ff98
2 changed files with 73 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/test/specs/templateValuesSrv-specs.js
View File

@@ -34,12 +34,13 @@ define([
options: [{text: "test", value: "test"}]
};
beforeEach(function() {
beforeEach(function(done) {
var dashboard = { templating: { list: [variable] } };
var urlParams = {};
urlParams["var-apps"] = "new";
ctx.$location.search = sinon.stub().returns(urlParams);
ctx.service.init(dashboard);
ctx.service.init(dashboard).then(function() { done(); });
ctx.$rootScope.$digest();
});
it('should update current value', function() {
@@ -56,12 +57,13 @@ define([
options: [{text: "val1", value: "val1"}, {text: 'val2', value: 'val2'}, {text: 'val3', value: 'val3', selected: true}]
};
beforeEach(function() {
beforeEach(function(done) {
var dashboard = { templating: { list: [variable] } };
var urlParams = {};
urlParams["var-apps"] = ["val2", "val1"];
ctx.$location.search = sinon.stub().returns(urlParams);
ctx.service.init(dashboard);
ctx.service.init(dashboard).then(function() { done(); });
ctx.$rootScope.$digest();
});
it('should update current value', function() {