Working on better handling of variables and url init and state

src/test/specs/helpers.js

@@ -51,6 +51,7 @@ define([
     self.templateSrv = new TemplateSrvStub();
     self.templateSrv = new TemplateSrvStub();
     self.timeSrv = new TimeSrvStub();
     self.timeSrv = new TimeSrvStub();
     self.datasourceSrv = {};
     self.datasourceSrv = {};
+    self.$routeParams = {};
 
 
     this.providePhase = function(mocks) {
     this.providePhase = function(mocks) {
      return module(function($provide) {
      return module(function($provide) {
@@ -103,6 +104,7 @@ define([
     this.replace = function(text) {
     this.replace = function(text) {
       return _.template(text, this.data,  this.templateSettings);
       return _.template(text, this.data,  this.templateSettings);
     };
     };
+    this.init = function() {};
     this.updateTemplateData = function() { };
     this.updateTemplateData = function() { };
     this.variableExists = function() { return false; };
     this.variableExists = function() { return false; };
     this.highlightVariablesAsHtml = function(str) { return str; };
     this.highlightVariablesAsHtml = function(str) { return str; };

src/test/specs/templateValuesSrv-specs.js

@@ -10,7 +10,7 @@ define([
     var ctx = new helpers.ServiceTestContext();
     var ctx = new helpers.ServiceTestContext();
 
 
     beforeEach(module('grafana.services'));
     beforeEach(module('grafana.services'));
-    beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv']));
+    beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv', "$routeParams"]));
     beforeEach(ctx.createService('templateValuesSrv'));
     beforeEach(ctx.createService('templateValuesSrv'));
 
 
     describe('update interval variable options', function() {
     describe('update interval variable options', function() {
@@ -27,6 +27,20 @@ define([
       });
       });
     });
     });
 
 
+    describe.only('should init values', function() {
+      var variables = [
+        { name: 'test', current: { value: 'hej' }}
+      ];
+      var dashboard = { templating: { list: variables } };
+
+      beforeEach(function() {
+        ctx.service.init(dashboard);
+      });
+
+      it('should update options array', function() {
+      });
+    });
+
     function describeUpdateVariable(desc, fn) {
     function describeUpdateVariable(desc, fn) {
       describe(desc, function() {
       describe(desc, function() {
         var scenario = {};
         var scenario = {};