【fix】UT

songyumeng · songyumeng · commit 77e9293597c6 · 2025-03-18T15:19:05.000+08:00
diff --git a/test/common/mapping/WebMapV2BaseSpec.js b/test/common/mapping/WebMapV2BaseSpec.js
@@ -2,6 +2,7 @@ import { createWebMapV2BaseExtending } from '../../../src/common/mapping/WebMapV
 import { FetchRequest } from '../../../src/common/util/FetchRequest';
 import * as epsgDefine from '../../../src/common/mapping/utils/epsg-define';
 import cloneDeep from 'lodash.clonedeep';
+import { Canvg } from 'canvg';
 
 describe('WebMapBaseSpec.js', () => {
   const id = 123;
@@ -1018,17 +1019,13 @@ describe('WebMapBaseSpec.js', () => {
       start: jasmine.createSpy('start'),
       stop: jasmine.createSpy('stop')
     };
-    window.canvg = {
-      default: {
-        from: (ctx) => {
-          return {
-            then: (resolveCb) => {
-              resolveCb(mockRes);
-            }
-          };
+    spyOn( Canvg , 'from').and.callFake( (ctx) => {
+      return {
+        then: (resolveCb) => {
+          resolveCb(mockRes);
         }
-      }
-    };
+      };
+    })
     const svgUrl = 'http://testsvg';
     const divDom = {
       appendChild: jasmine.createSpy('appendChild')
@@ -1039,7 +1036,6 @@ describe('WebMapBaseSpec.js', () => {
     expect(divDom.appendChild).toHaveBeenCalled();
     expect(callBack).toHaveBeenCalled();
     expect(webMapBase.canvgsV.length).toBe(1);
-    window.canvg = undefined;
     done();
   });
 
diff --git a/test/mapboxgl/mapping/WebMapV2Spec.js b/test/mapboxgl/mapping/WebMapV2Spec.js
@@ -6,6 +6,7 @@ import { ArrayStatistic } from '@supermapgis/iclient-common/util/ArrayStatistic'
 import { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
 import * as DataFlowServiceUtil from '../../../src/mapboxgl/services/DataFlowService';
 import '../../resources/WebMapV5.js';
+import { Canvg } from 'canvg';
 
 function DataFlowService(serviceUrl) {
   const dataflowFeature = {
@@ -311,12 +312,9 @@ describe('mapboxgl_WebMapV2', () => {
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
     window.jsonsql = { query: () => [{}] };
-    window.canvg = {
-      default: {
-        from: (ctx, url, callback) =>
-          Promise.resolve({ stop: jasmine.createSpy('stop'), start: jasmine.createSpy('start') })
-      }
-    };
+   spyOn(Canvg, 'from').and.callFake((ctx, url, callback) =>
+     Promise.resolve({ stop: jasmine.createSpy('stop'), start: jasmine.createSpy('start') })
+   );
     window.geostats = class {
       setSerie() {}
     };
@@ -346,7 +344,6 @@ describe('mapboxgl_WebMapV2', () => {
     mapboxgl.CRS = undefined;
     mapboxgl.proj4 = undefined;
     window.jsonsql = undefined;
-    window.canvg = undefined;
     window.geostats = undefined;
     window.EchartsLayer = undefined;
     dataFlowServiceSpyTest = null;
diff --git a/test/maplibregl/mapping/WebMapV2Spec.js b/test/maplibregl/mapping/WebMapV2Spec.js
@@ -6,6 +6,7 @@ import { ArrayStatistic } from '@supermapgis/iclient-common/util/ArrayStatistic'
 import { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
 import * as DataFlowServiceUtil from '../../../src/maplibregl/services/DataFlowService';
 import '../../resources/WebMapV5.js';
+import { Canvg } from 'canvg';
 
 function DataFlowService(serviceUrl) {
   const dataflowFeature = {
@@ -312,12 +313,9 @@ describe('maplibregl_WebMapV2', () => {
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
     
     window.jsonsql = { query: () => [{}] };
-    window.canvg = {
-      default: {
-        from: (ctx, url, callback) =>
-          Promise.resolve({ stop: jasmine.createSpy('stop'), start: jasmine.createSpy('start') })
-      }
-    };
+    spyOn( Canvg , 'from').and.callFake((ctx, url, callback) =>{
+        return  Promise.resolve({ stop: jasmine.createSpy('stop'), start: jasmine.createSpy('start') })
+    })
     window.geostats = class {
       setSerie() {}
     };
@@ -347,7 +345,6 @@ describe('maplibregl_WebMapV2', () => {
     maplibregl.CRS = undefined;
     maplibregl.proj4 = undefined;
     window.jsonsql = undefined;
-    window.canvg = undefined;
     window.geostats = undefined;
     window.EchartsLayer = undefined;
   });
