Skip to content

Commit 1b0a70a

Browse files
committed
e2e: refactor tests to use OL10 map instead of OL2 map
1 parent 79b4b7e commit 1b0a70a

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

tests/end2end/playwright/dnd-form.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test.describe(
2020

2121
await project.dock.getByText('tab2').click();
2222
await project.editingField('field_in_dnd_form').fill('value in DND form');
23-
await project.clickOnMapLegacy(600, 200);
23+
await project.clickOnMap(600, 200);
2424

2525
await project.editingSubmitForm();
2626
const ids = await editedFeatureIds(page);

tests/end2end/playwright/editing-geometry.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ test.describe('Geometry editing',
3333

3434
const x1 = 600;
3535
const y1 = 200;
36-
await project.clickOnMapLegacy(x1, y1);
36+
await project.clickOnMap(x1, y1);
3737
if (geom === 'polygon'){
38-
await project.clickOnMapLegacy(x1, y1 + 100);
38+
await project.clickOnMap(x1, y1 + 100);
3939
}
4040
if (geom === 'line' || geom === 'polygon') {
41-
await project.dblClickOnMapLegacy(x1 + 100, y1);
41+
await project.dblClickOnMap(x1 + 100, y1);
4242
}
4343
await project.editingSubmitForm();
4444

tests/end2end/playwright/editing-value-relation.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ test.describe('Value relation widget',
1515

1616
const select = await page.locator("#jforms_view_edition_code_with_geom_exp");
1717

18-
await project.clickOnMapLegacy(650, 200);
18+
await project.clickOnMap(650, 200);
1919

2020
await select.selectOption({value: ''});
2121

22-
await project.mapOl2.dragTo(project.mapOl2, {
22+
await project.map.dragTo(project.map, {
2323
sourcePosition: { x: 650, y: 200 },
2424
targetPosition: { x: 500, y: 200 },
2525
});

tests/end2end/playwright/edition-form.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ test.describe(
705705
await project.checkEditionFormTextField('Name check', '', 'Name check', true);
706706

707707
// insert a point feature
708-
await project.clickOnMapLegacy(488, 331);
708+
await project.clickOnMap(488, 331);
709709
// fill the form
710710
await project.fillEditionFormTextInput('point_name', 'text insert');
711711
let editFeatureRequestPromiseUpdate = page.waitForResponse(response => response.url().includes('editFeature'));

tests/end2end/playwright/form_advanced.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test.describe('Advanced form', function () {
1717
const getDataPromise = page.waitForResponse(/jelix\/forms\/getdata/)
1818

1919
// Click on map as form needs a geometry
20-
project.clickOnMapLegacy(410, 175);
20+
project.clickOnMap(410, 175);
2121

2222
// wait for the response completed
2323
let getDataResponse = await getDataPromise;
@@ -149,7 +149,7 @@ test.describe('Advanced form', function () {
149149
request.postData()?.includes('_ref=sousquartier')
150150
);
151151
// Assert quartier value is good for another drawn point
152-
project.clickOnMapLegacy(455, 250);
152+
project.clickOnMap(455, 250);
153153
// Wait for GetData quartier completed (based on geometry)
154154
let getDataQuartier = await (await getDataQuartierPromise).response();
155155
expect(getDataQuartier.status()).toBe(200);

tests/end2end/playwright/form_edition.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ test.describe('Form edition', function () {
135135
await expect(page.locator('#edition .edition-tabs')).toBeVisible();
136136
await expect(page.locator('#edition-form-container')).toBeVisible();
137137

138-
await project.clickOnMapLegacy(630-30 , 325-75);
138+
await project.clickOnMap(630-30 , 325-75);
139139

140140
// submit the form
141141
saveFeatureRequestPromise = page.waitForRequest(/lizmap\/edition\/saveFeature/);

tests/end2end/playwright/form_edition_value_relation_field.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ test.describe('Form edition all field type', function () {
248248
// Intercept getData query to wait for its end
249249
let getDataRequestPromise = page.waitForRequest(/jelix\/forms\/getdata/);
250250
// Click on the map over Zone A1
251-
project.clickOnMapLegacy(530-150, 375-50);
251+
project.clickOnMap(530-150, 375-50);
252252
// Wait for getData query ends, check request parameters and response
253253
let getDataRequest = await getDataRequestPromise;
254254
let getDataExpectedParameters = {

tests/end2end/playwright/singleWMS.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ test.describe('Single WMS layer', () => {
393393
await formRequest.response();
394394

395395
// edition id done on #map
396-
await project.clickOnMapLegacy(532, 293);
396+
await project.clickOnMap(532, 293);
397397
await project.fillEditionFormTextInput('title', 'Test insert');
398398

399399
// submit the form

0 commit comments

Comments
 (0)