fix test

Author: algenty

spec/__mocks__/ctrl.js

@@ -0,0 +1,4 @@
+module.exports = {
+  notify: jest.fn(),
+  clearNotify: jest.fn(),
+};

spec/global_class.test.ts

@@ -3,12 +3,8 @@ import { $GF, GFDrawioTools, GFTimer, GFVariables } from '../src/globals_class';
 const $scope = require('$scope');
 const templateSrv = {};
 const dashboard = {};
-const ctrl = {
-  notify: jest.fn(),
-  clearNotify: jest.fn(),
-};
+const ctrl = require('ctrl');
 const $gf = $GF.create($scope, templateSrv, dashboard, ctrl);
-
 const xmlGraph =
   '<mxGraphModel dx="1073" dy="521" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0"><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="arrow-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;jettySize=auto;orthogonalLoop=1;strokeWidth=4;shadow=1;" parent="1" source="shape-grafana" target="shape-love" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><object label="Grafana" href="www.google.fr" id="shape-grafana"><mxCell style="rounded=1;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;shadow=1;" parent="1" vertex="1"><mxGeometry x="10" y="10" width="120" height="60" as="geometry"/></mxCell></object><mxCell id="arrow-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;jettySize=auto;orthogonalLoop=1;strokeWidth=4;shadow=1;" parent="1" source="shape-love" target="shape-mxgraph" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="shape-love" value="loves" style="triangle;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;shadow=1;" parent="1" vertex="1"><mxGeometry x="210" width="60" height="80" as="geometry"/></mxCell><mxCell id="shape-mxgraph" value="mxGraph" style="ellipse;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;shadow=1;" parent="1" vertex="1"><mxGeometry x="340" width="120" height="80" as="geometry"/></mxCell><mxCell id="text-grafana" value="MyText : TextVal" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1"><mxGeometry x="9" y="50" width="120" height="20" as="geometry"/></mxCell><mxCell id="text-arrow1" value="Text 2" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1"><mxGeometry x="150" y="20" width="40" height="20" as="geometry"/></mxCell><mxCell id="text-arrow2" value="Text 3" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1"><mxGeometry x="280" y="20" width="40" height="20" as="geometry"/></mxCell><mxCell id="text-mxgraph" value="Text 4" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1"><mxGeometry x="380" y="50" width="40" height="20" as="geometry"/></mxCell></root></mxGraphModel>';
 const compGraph =
@@ -42,65 +38,67 @@ describe('Test Global $GF utils', () => {
 
   // Test if eval javascript works
   describe('Secure Eval', () => {
-    //TODO : Fix eval
-    // it('should be enable to understand Math Lib', () => {
-    //   expect($gf.eval('Math.random()')).toBeGreaterThan(0);
-    //   expect($gf.utils.evalIt_deprecated('Math.random() * 100')).toBeLessThanOrEqual(101);
-    // });
-    test('should be eval simple operation 2+2', () => {
-      expect($gf.utils.evalIt_deprecated('2+2')).toBe(4);
+    let variables;
+    beforeAll(()=> {
+      variables = GFVariables.create();
+    })
+    afterAll(()=> {
+      variables = GFVariables.create();
+    })
+    it('should be enable to understand Math Lib', () => {
+      expect(variables.eval('Math.random()')).toBeGreaterThan(0);
+      expect(variables.eval('Math.random() * 100')).toBeLessThanOrEqual(101);
+    });
+    it('should be eval simple operation 2+2', () => {
+      expect(variables.eval('2+2')).toBe(4);
     });
   });
 
   // Test if globalvariables
   describe('Variables', () => {
-    // let $gf: $GF;
-    // const $scope = jest.fn();
-    // const templateSrv = jest.fn();
-    // const dashboard = jest.fn();
-    // const ctrl = jest.fn();
-    const key = '_value';
-    const value = 12345;
-    const text_entry = 'My text is ${_value} at this time';
-    const text_result = 'My text is 12345 at this time';
-    let variable: GFVariables;
+    let variables, key, value, text_entry, text_result;
     beforeEach(()=>{
-      // $gf = $GF.create($scope, templateSrv, dashboard, ctrl)
-      variable = GFVariables.create();
+      key = '_value';
+      value = 12345;
+      text_entry = 'My text is ${_value} at this time';
+      text_result = 'My text is 12345 at this time';
+      variables = GFVariables.create();
     });
     beforeEach(()=>{
-      // $gf = $GF.create($scope, templateSrv, dashboard, ctrl)
-      variable.clear();
+      variables.clear();
     });
     test('Should be not null', () => {
-      expect(variable).not.toBe(undefined);
-      expect(variable).toMatchSnapshot();
-      expect(variable.get(key)).toBe(undefined);
+      expect(variables).not.toBe(undefined);
+      expect(variables).toMatchSnapshot();
+      expect(variables.get(key)).toBe(undefined);
     });
 
     test('Should be null for key ' + key, () => {
-      expect(variable.get(key)).toBe(undefined);
+      expect(variables.get(key)).toBe(undefined);
     });
     test('Should be not null for key ' + key, () => {
-      variable.set(key, value);
-      expect(variable.get(key)).not.toBe(undefined);
-      expect(variable.get(key)).toBe(value);
+      variables.set(key, value);
+      expect(variables.get(key)).not.toBe(undefined);
+      expect(variables.get(key)).toBe(value);
     });
 
     test('should be a list', () => {
-      expect(variable.keys()).toStrictEqual(['_value']);
+      variables.set(key, value);
+      expect(variables.keys()).toStrictEqual(['_value']);
     });
 
     test('should be a list ${}', () => {
-      expect(variable.getVarsNames()).toStrictEqual(['${_value}']);
+      variables.set(key, value);
+      expect(variables.getVarsNames()).toStrictEqual(['${_value}']);
     });
 
     test('Remplace text with variable', () => {
-      expect(variable.replaceText(text_entry)).toBe(text_result);
+      variables.set(key, value);
+      expect(variables.replaceText(text_entry)).toBe(text_result);
     });
 
     test('should be evaluate', () => {
-      expect(variable.eval('${_value}*2')).toBe(24690);
+      expect(variables.eval('${_value}*2')).toBe(24690);
     });
 
     test('Should be null after remove key ' + key, () => {

src/globals_class.ts

@@ -438,7 +438,7 @@ export class GFVariables {
   replaceText(text: string): string {
     try {
       let templateSrv = GFPlugin.getTemplateSrv();
-      text = templateSrv !== undefined ? templateSrv.replaceWithText(text) : text;
+      text = templateSrv !== undefined ? templateSrv.replace(text) : text;
       for (let [key, value] of this._variables) {
         text = text.replace('${' + key + '}', value);
       }