Skip to content

Commit 628af31

Browse files
committed
【UT】fix 地图打印; review by luox
1 parent c4e1b86 commit 628af31

File tree

7 files changed

+293
-67
lines changed

7 files changed

+293
-67
lines changed

src/common/iServer/WebPrintingService.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,15 @@ export class WebPrintingService extends CommonServiceBase {
192192
} else if (layoutOptions.copyright === void 0) {
193193
params.layoutOptions.copyright = null;
194194
}
195-
if (!hasSummaryText || !layoutOptions.summaryText) {
195+
if (!hasSummaryText) {
196196
delete params.layoutOptions.summaryText;
197+
} else if (layoutOptions.summaryText === void 0) {
198+
params.layoutOptions.summaryText = null;
197199
}
198-
if (!hasTime || !layoutOptions.time) {
200+
if (!hasTime) {
199201
delete params.layoutOptions.time;
202+
} else if (layoutOptions.time === void 0) {
203+
params.layoutOptions.time = null;
200204
}
201205
if (!hasLittleMap || !layoutOptions.littleMapOptions) {
202206
delete params.layoutOptions.littleMapOptions;

test/common/iServer/WebPrintingServiceSpec.js

Lines changed: 103 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/leaflet/services/WebPrintingJobServiceSpec.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,12 @@ describe('leaflet_WebPrintingJobService', () => {
5151
})
5252
});
5353
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
54-
expect(method).toBe('POST');
55-
expect(testUrl).toBe(url + '/jobs');
5654
expect(params).not.toBeNull();
57-
const paramsObj = JSON.parse(params.replace(/'/g, "\""));
58-
expect(paramsObj.layoutOptions.subTitle).toBeNull();
59-
expect(paramsObj.layoutOptions.copyright).toBeNull();
6055
expect(options).not.toBeNull();
61-
return Promise.resolve(new Response(JSON.stringify(createWebPringintJobResultJson)));
56+
if (testUrl === url + '/jobs') {
57+
return Promise.resolve(new Response(JSON.stringify(createWebPringintJobResultJson)));
58+
}
59+
return Promise.resolve(new Response(JSON.stringify(getLayoutsResultJson)));
6260
});
6361
jobService.createWebPrintingJob(null);
6462
jobService.createWebPrintingJob(param, (serviceResult) => {

test/mapboxgl/services/WebPrintingJobServiceSpec.js

Lines changed: 70 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/maplibregl/services/WebPrintingJobServiceSpec.js

Lines changed: 4 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)