Skip to content

Commit eca2eec

Browse files
committed
Tests e2e Playwright: enhancing checking Getcapabilities URL in API
To check URL, it is better to use new URL than to compare string.
1 parent 389bb6f commit eca2eec

File tree

1 file changed

+27
-2
lines changed

1 file changed

+27
-2
lines changed

tests/end2end/playwright/requests-api.spec.js

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import {expect, test} from '@playwright/test';
33
import {
44
checkJson,
5+
expectParametersToContain,
56
requestGETWithAdminBasicAuth,
67
requestPOSTWithAdminBasicAuth,
78
requestDELETEWithAdminBasicAuth,
@@ -103,8 +104,32 @@ test.describe('Connected via Basic auth',
103104
expect(json.bbox).toMatch(new RegExp("^(\\d+\\.\\d+, ){3}\\d+\\.\\d+$"));
104105
expect(json.needsUpdateError).toBeFalsy();
105106
expect(json.acl).toBeTruthy();
106-
expect(json.wmsGetCapabilitiesUrl).toBe("http://localhost:8130/index.php/lizmap/service?repository=testsrepository&project=attribute_table&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities");
107-
expect(json.wmtsGetCapabilitiesUrl).toBe("http://localhost:8130/index.php/lizmap/service?repository=testsrepository&project=attribute_table&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetCapabilities");
107+
expect(json.wmsGetCapabilitiesUrl).toBeDefined();
108+
const wmsGetCapabilitiesUrl = new URL(json.wmsGetCapabilitiesUrl);
109+
expect(wmsGetCapabilitiesUrl.protocol).toBe('http:');
110+
expect(wmsGetCapabilitiesUrl.host).toBe('localhost:8130');
111+
expect(wmsGetCapabilitiesUrl.pathname).toBe('/index.php/lizmap/service');
112+
const wmsGetCapabilitiesParams = {
113+
'repository': 'testsrepository',
114+
'project': 'attribute_table',
115+
'SERVICE': 'WMS',
116+
'VERSION': '1.3.0',
117+
'REQUEST': 'GetCapabilities',
118+
};
119+
await expectParametersToContain('wmsGetCapabilitiesUrl', wmsGetCapabilitiesUrl.search, wmsGetCapabilitiesParams);
120+
expect(json.wmtsGetCapabilitiesUrl).toBeDefined();
121+
const wmtsGetCapabilitiesUrl = new URL(json.wmtsGetCapabilitiesUrl);
122+
expect(wmtsGetCapabilitiesUrl.protocol).toBe('http:');
123+
expect(wmtsGetCapabilitiesUrl.host).toBe('localhost:8130');
124+
expect(wmtsGetCapabilitiesUrl.pathname).toBe('/index.php/lizmap/service');
125+
const wmtsGetCapabilitiesParams = {
126+
'repository': 'testsrepository',
127+
'project': 'attribute_table',
128+
'SERVICE': 'WMTS',
129+
'VERSION': '1.0.0',
130+
'REQUEST': 'GetCapabilities',
131+
};
132+
await expectParametersToContain('wmtsGetCapabilitiesUrl', wmtsGetCapabilitiesUrl.search, wmtsGetCapabilitiesParams);
108133
expect(json.version).toBeDefined();
109134
expect(json.saveDateTime).toBeDefined();
110135
expect(json.saveUser).toBeDefined();

0 commit comments

Comments
 (0)