Skip to content

Commit 4957d13

Browse files
zhushusunzhushusun
committed
fix ci 失败 原因是resource文件了响应结果是公共的 review by songym
1 parent 8ddc0c9 commit 4957d13

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎test/leaflet/mapping/WebMapSpec.js‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ describe('leaflet_WebMap', () => {
496496
spyOn(FetchRequest, 'get').and.callFake((url) => {
497497
if (url === server + "/web/maps/" + id + ".json") {
498498
var escapedJson = webMap_HeatThemeLayer;
499-
return Promise.resolve(new Response(escapedJson));
499+
return Promise.resolve(new Response(JSON.stringify(escapedJson)));
500500
}
501501
return Promise.resolve();
502502
});
@@ -513,32 +513,32 @@ describe('leaflet_WebMap', () => {
513513
expect(mapInfo.extent.left).toEqual(12771920.289073);
514514
expect(mapInfo.extent.right).toEqual(13157774.407857);
515515
expect(mapInfo.extent.top).toEqual(5011871.6747059);
516-
expect(mapInfo.layers.length).toEqual(1);
517-
expect(mapInfo.layers[0].title).toBe("北京市高等院校");
518-
expect(mapInfo.layers[0].id).toEqual(14248);
519-
expect(mapInfo.layers[0].type).toBeNull();
520-
expect(mapInfo.layers[0].identifier).toBe("THEME");
521-
expect(mapInfo.layers[0].layerType).toBe("FEATURE_LAYER");
522-
expect(mapInfo.layers[0].url).toBe("http://supermapol/iserver/services/map_ShiLiShuJu/rest/maps/北京市高等院校@公众数据");
523-
expect(mapInfo.layers[0].themeSettings).not.toBeNull();
516+
expect(mapInfo.layers.length).toEqual(2);
517+
expect(mapInfo.layers[1].title).toBe("北京_县级行政区划图");
518+
expect(mapInfo.layers[1].id).toEqual(14248);
519+
expect(mapInfo.layers[1].type).toBeNull();
520+
expect(mapInfo.layers[1].identifier).toBe("THEME");
521+
expect(mapInfo.layers[1].layerType).toBe("FEATURE_LAYER");
522+
expect(mapInfo.layers[1].url).toContain("北京市高等院校@公众数据");
523+
expect(mapInfo.layers[1].themeSettings).not.toBeNull();
524524
expect(mapInfo.level).toEqual(6);
525525
expect(mapInfo.sourceType).toBe("MAPVIEWER");
526526
expect(mapInfo.resolution).toEqual(0);
527527
expect(mapInfo.tags.length).toEqual(1);
528-
expect(mapInfo.thumbnail).toBe("https://supermapol/services/../resources/thumbnail/map1765.png");
529528
expect(mapInfo.title).toBe("北京高校分布热点图");
530529
expect(mapInfo.userName).toBe("48372");
531530
expect(map.options.server).toBe(server);
531+
map = null;
532532
done();
533-
}, 1000)
533+
}, 5000)
534534
});
535535

536536
it('createThemeLayer_UniqueLayer', (done) => {
537537
var id = 1765;
538538
spyOn(FetchRequest, 'get').and.callFake((url) => {
539539
if (url === server + "/web/maps/" + id + ".json") {
540540
var escapedJson = webMap_UniqueThemeLayer;
541-
return Promise.resolve(new Response(escapedJson));
541+
return Promise.resolve(new Response(JSON.stringify(escapedJson)));
542542
}
543543
return Promise.resolve();
544544
});
@@ -555,32 +555,32 @@ describe('leaflet_WebMap', () => {
555555
expect(mapInfo.extent.left).toEqual(12771920.289073);
556556
expect(mapInfo.extent.right).toEqual(13157774.407857);
557557
expect(mapInfo.extent.top).toEqual(5011871.6747059);
558-
expect(mapInfo.layers.length).toEqual(1);
559-
expect(mapInfo.layers[0].title).toBe("北京_县级行政区划图");
560-
expect(mapInfo.layers[0].id).toEqual(14247);
561-
expect(mapInfo.layers[0].type).toBeNull();
562-
expect(mapInfo.layers[0].identifier).toBe("THEME");
563-
expect(mapInfo.layers[0].layerType).toBe("FEATURE_LAYER");
564-
expect(mapInfo.layers[0].url).toBe("http://supermapol/iserver/services/map_ShiLiShuJu/rest/maps/北京_县级行政区划图@公众数据")
565-
expect(mapInfo.layers[0].themeSettings).not.toBeNull();
558+
expect(mapInfo.layers.length).toEqual(2);
559+
expect(mapInfo.layers[1].title).toBe("北京_县级行政区划图");
560+
expect(mapInfo.layers[1].id).toEqual(14247);
561+
expect(mapInfo.layers[1].type).toBeNull();
562+
expect(mapInfo.layers[1].identifier).toBe("THEME");
563+
expect(mapInfo.layers[1].layerType).toBe("FEATURE_LAYER");
564+
expect(mapInfo.layers[1].url).toContain("北京_县级行政区划图@公众数据")
565+
expect(mapInfo.layers[1].themeSettings).not.toBeNull();
566566
expect(mapInfo.level).toEqual(6);
567567
expect(mapInfo.sourceType).toBe("MAPVIEWER");
568568
expect(mapInfo.resolution).toEqual(0);
569569
expect(mapInfo.tags.length).toEqual(1);
570-
expect(mapInfo.thumbnail).toBe("https://supermapol/services/../resources/thumbnail/map1765.png");
571570
expect(mapInfo.title).toBe("北京高校分布热点图");
572571
expect(mapInfo.userName).toBe("48372");
573572
expect(map.options.server).toBe(server);
573+
map = null;
574574
done();
575-
}, 1000)
575+
}, 5000)
576576
});
577577

578578
it('createThemeLayer_RangeLayer', (done) => {
579579
var id = 1959;
580580
spyOn(FetchRequest, 'get').and.callFake((url) => {
581581
if (url === server + "/web/maps/" + id + ".json") {
582582
var escapedJson = webMap_RangeThemeLayer;
583-
return Promise.resolve(new Response(escapedJson));
583+
return Promise.resolve(new Response(JSON.stringify(escapedJson)));
584584
}
585585
return Promise.resolve();
586586
});
@@ -597,21 +597,21 @@ describe('leaflet_WebMap', () => {
597597
expect(mapInfo.extent.left).toEqual(12918590.740275);
598598
expect(mapInfo.extent.right).toEqual(12991970.287429);
599599
expect(mapInfo.extent.top).toEqual(4870108.5272901);
600-
expect(mapInfo.layers.length).toEqual(1);
601-
expect(mapInfo.layers[0].title).toBe("北京市三级综合医院");
602-
expect(mapInfo.layers[0].type).toBeNull();
603-
expect(mapInfo.layers[0].identifier).toBe("THEME");
604-
expect(mapInfo.layers[0].layerType).toBe("FEATURE_LAYER");
605-
expect(mapInfo.layers[0].url).toBe("http://supermapol/iserver/services/map_ShiLiShuJu/rest/maps/北京市三级综合医院@公众数据")
606-
expect(mapInfo.layers[0].themeSettings).not.toBeNull();
600+
expect(mapInfo.layers.length).toEqual(2);
601+
expect(mapInfo.layers[1].title).toBe("北京市三级综合医院");
602+
expect(mapInfo.layers[1].type).toBeNull();
603+
expect(mapInfo.layers[1].identifier).toBe("THEME");
604+
expect(mapInfo.layers[1].layerType).toBe("FEATURE_LAYER");
605+
expect(mapInfo.layers[1].url).toContain("北京市三级综合医院@公众数")
606+
expect(mapInfo.layers[1].themeSettings).not.toBeNull();
607607
expect(mapInfo.level).toEqual(12);
608608
expect(mapInfo.sourceType).toBe("MAPVIEWER");
609609
expect(mapInfo.resolution).toEqual(0);
610610
expect(mapInfo.tags.length).toEqual(1);
611-
expect(mapInfo.thumbnail).toBe("https://supermapol/services/../resources/thumbnail/map1959.png");
612611
expect(mapInfo.title).toBe("北京三级甲等医院");
613612
expect(mapInfo.userName).toBe("10047");
614613
expect(map.options.server).toBe(server);
614+
map = null;
615615
done();
616616
}, 1000)
617617
});

0 commit comments

Comments
 (0)