IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 07:35:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): fixed issues with optimized build, fixes #6096

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-09-22 10:22:16 +02:00
parent 39af588a94
commit d8df421b43
6 changed files with 5 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ export class ConstantVariable implements Variable {
current: {},
};
/** @ngInject */
/** @ngInject **/
constructor(private model, private variableSrv) {
assignModelProperties(this, model, this.defaults);
}

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

@ -22,7 +22,7 @@ export class DatasourceVariable implements Variable {
query: '',
};
/** @ngInject */
/** @ngInject **/
constructor(private model, private datasourceSrv, private variableSrv) {
assignModelProperties(this, model, this.defaults);
}

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

@ -6,7 +6,7 @@ import {variableTypes} from './variable';
export class VariableEditorCtrl {
/** @ngInject */
/** @ngInject **/
constructor(private $scope, private datasourceSrv, private variableSrv, templateSrv) {
$scope.variableTypes = variableTypes;
$scope.ctrl = {};

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

@ -28,7 +28,7 @@ export class IntervalVariable implements Variable {
auto_count: 30,
};
/** @ngInject */
/** @ngInject **/
constructor(private model, private timeSrv, private templateSrv, private variableSrv) {
assignModelProperties(this, model, this.defaults);
this.refresh = 2;

1
public/app/features/templating/query_variable.ts
View File

@ -40,6 +40,7 @@ export class QueryVariable implements Variable {
tagValuesQuery: null,
};
/** @ngInject **/
constructor(private model, private datasourceSrv, private templateSrv, private variableSrv, private $q) {
// copy model properties to this instance
assignModelProperties(this, model, this.defaults);

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

@ -1,58 +0,0 @@
define([
'../mocks/dashboard-mock',
'./helpers',
'app/features/templating/templateValuesSrv'
], function(dashboardMock, helpers) {
'use strict';
describe('templateValuesSrv', function() {
var ctx = new helpers.ServiceTestContext();
beforeEach(module('grafana.services'));
beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv', '$location']));
beforeEach(ctx.createService('templateValuesSrv'));
describe('when template variable is present in url', function() {
describe('and setting simple variable', function() {
var variable = {
name: 'apps',
current: {text: "test", value: "test"},
options: [{text: "test", value: "test"}]
};
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).then(function() { done(); });
ctx.$rootScope.$digest();
});
it('should update current value', function() {
expect(variable.current.value).to.be("new");
expect(variable.current.text).to.be("new");
});
});
// describe('and setting adhoc variable', function() {
// var variable = {name: 'filters', type: 'adhoc'};
//
// beforeEach(function(done) {
// var dashboard = { templating: { list: [variable] } };
// var urlParams = {};
// urlParams["var-filters"] = "hostname|gt|server2";
// ctx.$location.search = sinon.stub().returns(urlParams);
// ctx.service.init(dashboard).then(function() { done(); });
// ctx.$rootScope.$digest();
// });
//
// it('should update current value', function() {
// expect(variable.tags[0]).to.eq({tag: 'hostname', value: 'server2'});
// });
// });
});
});
});