IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Chore: fix type errors in tests (#63270)

Browse Source 
* fix any's in tests

* fix more any's in tests

* more test type fixes

* fixing any's in tests part 3

* more test type fixes

* fixing test any's p5

* some tidy up

* fix template_srv
This commit is contained in:
Ashley Harrison
2023-02-14 16:46:42 +01:00
committed by GitHub
parent 4b0faf1c9e
commit f8d89eff56
139 changed files with 675 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/templating/template_srv.test.ts
+12 -10
View File
@@ -10,6 +10,8 @@ import { createAdHocVariableAdapter } from '../variables/adhoc/adapter';
import { createQueryVariableAdapter } from '../variables/query/adapter';
import { VariableModel } from '../variables/types';
import { TemplateSrv } from './template_srv';
const key = 'key';
variableAdapters.setInit(() => [
@@ -22,13 +24,13 @@ const interpolateMock = jest.fn();
jest.mock('@grafana/scenes', () => ({
...jest.requireActual('@grafana/scenes'),
sceneGraph: {
interpolate: (...args: any[]) => interpolateMock(...args),
interpolate: (...args: unknown[]) => interpolateMock(...args),
},
}));
describe('templateSrv', () => {
silenceConsoleOutput();
let _templateSrv: any;
let _templateSrv: TemplateSrv;
describe('init', () => {
beforeEach(() => {
@@ -48,7 +50,7 @@ describe('templateSrv', () => {
it('scoped vars should support objects', () => {
const target = _templateSrv.replace('${series.name} ${series.nested.field}', {
series: { value: { name: 'Server1', nested: { field: 'nested' } } },
series: { value: { name: 'Server1', nested: { field: 'nested' } }, text: 'foo' },
});
expect(target).toBe('Server1 nested');
});
@@ -63,14 +65,14 @@ describe('templateSrv', () => {
it('scoped vars should support objects with propert names with dot', () => {
const target = _templateSrv.replace('${series.name} ${series.nested["field.with.dot"]}', {
series: { value: { name: 'Server1', nested: { 'field.with.dot': 'nested' } } },
series: { value: { name: 'Server1', nested: { 'field.with.dot': 'nested' } }, text: 'foo' },
});
expect(target).toBe('Server1 nested');
});
it('scoped vars should support arrays of objects', () => {
const target = _templateSrv.replace('${series.rows[0].name} ${series.rows[1].name}', {
series: { value: { rows: [{ name: 'first' }, { name: 'second' }] } },
series: { value: { rows: [{ name: 'first' }, { name: 'second' }] }, text: 'foo' },
});
expect(target).toBe('first second');
});
@@ -658,8 +660,8 @@ describe('templateSrv', () => {
});
it('should not pass object to custom function', () => {
let passedValue: any = null;
_templateSrv.replace('this.${test}.filters', {}, (value: any) => {
let passedValue: string | null = null;
_templateSrv.replace('this.${test}.filters', {}, (value: string) => {
passedValue = value;
});
@@ -674,8 +676,8 @@ describe('templateSrv', () => {
});
it('should not pass object to custom function', () => {
let passedValue: any = null;
_templateSrv.replace('this.${test}.filters', {}, (value: any) => {
let passedValue: string | null = null;
_templateSrv.replace('this.${test}.filters', {}, (value: string) => {
passedValue = value;
});
@@ -827,7 +829,7 @@ describe('templateSrv', () => {
it('should use scene interpolator when scoped var provided', () => {
const variable = new TestVariable({});
_templateSrv.replace('test ${test}', { __sceneObject: { value: variable } });
_templateSrv.replace('test ${test}', { __sceneObject: { value: variable, text: 'foo' } });
expect(interpolateMock).toHaveBeenCalledTimes(1);
expect(interpolateMock.mock.calls[0][0]).toEqual(variable);
public/app/features/templating/template_srv.ts
+1 -1
View File
@@ -125,7 +125,7 @@ export class TemplateSrv implements BaseTemplateSrv {
return filters;
}
formatValue(value: any, format: any, variable: any, text?: string): string {
formatValue(value: any, format?: any, variable?: any, text?: string): string {
// for some scopedVars there is no variable
variable = variable || {};