Use spy instead of new argument

grafana · Jun 13, 2024 · ff940a3 · ff940a3
1 parent f383490
commit ff940a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.test.ts b/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.test.ts
@@ -2,16 +2,22 @@ import { ZabbixAPIConnector } from './zabbixAPIConnector';
 
 describe('Zabbix API connector', () => {
   describe('getProxies function', () => {
+    beforeAll(() => {
+      jest.spyOn(ZabbixAPIConnector.prototype, 'initVersion').mockResolvedValue('');
+    });
+
     it('should send the name parameter to the request when version is 7 or greater for the getProxies', async () => {
-      const zabbixAPIConnector = new ZabbixAPIConnector(true, true, 123, '7.0.0');
+      const zabbixAPIConnector = new ZabbixAPIConnector(true, true, 123);
+      zabbixAPIConnector.version = '7.0.0';
       zabbixAPIConnector.request = jest.fn();
 
       await zabbixAPIConnector.getProxies();
       expect(zabbixAPIConnector.request).toHaveBeenCalledWith('proxy.get', { output: ['proxyid', 'name'] });
     });
 
     it('should send the host parameter when version is less than 7.0.0', () => {
-      const zabbixAPIConnector = new ZabbixAPIConnector(true, true, 123, '6.0.0');
+      const zabbixAPIConnector = new ZabbixAPIConnector(true, true, 123);
+      zabbixAPIConnector.version = '6.0.0';
       zabbixAPIConnector.request = jest.fn();
 
       zabbixAPIConnector.getProxies();

diff --git a/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts b/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts
@@ -28,7 +28,7 @@ export class ZabbixAPIConnector {
   getVersionPromise: Promise<string>;
   datasourceId: number;
 
-  constructor(basicAuth: any, withCredentials: boolean, datasourceId: number, zabbixVersion?: string) {
+  constructor(basicAuth: any, withCredentials: boolean, datasourceId: number) {
     this.datasourceId = datasourceId;
     this.backendAPIUrl = `/api/datasources/${this.datasourceId}/resources/zabbix-api`;
 
@@ -37,8 +37,6 @@ export class ZabbixAPIConnector {
       withCredentials: withCredentials,
     };
 
-    this.version = zabbixVersion || null;
-
     this.getTrend = this.getTrend_ZBXNEXT1193;
     //getTrend = getTrend_30;