mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Bug Fix #14961
This commit is contained in:
parent
c7b556c0e4
commit
186e488ace
@ -469,6 +469,11 @@ describe('templateSrv', () => {
|
|||||||
name: 'empty_on_init',
|
name: 'empty_on_init',
|
||||||
current: { value: '', text: '' },
|
current: { value: '', text: '' },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
type: 'custom',
|
||||||
|
name: 'foo',
|
||||||
|
current: { value: 'constructor', text: 'constructor' },
|
||||||
|
}
|
||||||
]);
|
]);
|
||||||
_templateSrv.setGrafanaVariable('$__auto_interval_interval', '13m');
|
_templateSrv.setGrafanaVariable('$__auto_interval_interval', '13m');
|
||||||
_templateSrv.updateTemplateData();
|
_templateSrv.updateTemplateData();
|
||||||
@ -483,6 +488,12 @@ describe('templateSrv', () => {
|
|||||||
const target = _templateSrv.replaceWithText('Hello $empty_on_init');
|
const target = _templateSrv.replaceWithText('Hello $empty_on_init');
|
||||||
expect(target).toBe('Hello ');
|
expect(target).toBe('Hello ');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should not return a string representation of a constructor property', () => {
|
||||||
|
const target = _templateSrv.replaceWithText('$foo');
|
||||||
|
expect(target).not.toBe('function Object() { [native code] }');
|
||||||
|
expect(target).toBe('constructor');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('built in interval variables', () => {
|
describe('built in interval variables', () => {
|
||||||
|
@ -254,7 +254,9 @@ export class TemplateSrv {
|
|||||||
return match;
|
return match;
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.grafanaVariables[variable.current.value] || variable.current.text;
|
const value = this.grafanaVariables[variable.current.value];
|
||||||
|
|
||||||
|
return typeof(value) === 'string' ? value : variable.current.text;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user