Skip to content

Commit 4bd7b2e

Browse files
nboisteaultnboisteault
committed
e2e: catch datatables ajax requests instead of WFS getFeature ones
1 parent 657aedb commit 4bd7b2e

File tree

4 files changed

+32
-42
lines changed

4 files changed

+32
-42
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@ test.describe('Multiple geometry layers', () => {
218218

219219
const num_rec = 3;
220220

221-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
221+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
222222

223223
// DOUBLE_GEOM_GEOM
224224
// open main layer attribute table panel
225225
await page.locator('#attribute-layer-list button[value="double_geom_geom"]').click();
226-
await getFeatureRequestPromise;
226+
await datatablesRequestPromise;
227227

228228
let double_geom_geom_attr_table_head = page.locator("#attribute-layer-table-double_geom_geom_wrapper .dataTables_scrollHead table");
229229
let double_geom_geom_attr_table = page.locator("#attribute-layer-table-double_geom_geom");
@@ -249,7 +249,7 @@ test.describe('Multiple geometry layers', () => {
249249
// open main layer attribute table panel
250250
await page.locator('#nav-tab-attribute-summary').click();
251251
await page.locator('#attribute-layer-list button[value="double_geom_geom_d"]').click();
252-
await getFeatureRequestPromise;
252+
await datatablesRequestPromise;
253253

254254
let double_geom_geom_d_attr_table_head = page.locator("#attribute-layer-table-double_geom_geom_d_wrapper .dataTables_scrollHead table");
255255
let double_geom_geom_d_attr_table = page.locator("#attribute-layer-table-double_geom_geom_d");
@@ -397,12 +397,12 @@ test.describe('Multiple geometry layers', () => {
397397

398398
const num_rec = 4;
399399

400-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
400+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
401401

402402
// TRIPLE_GEOM_POINT
403403
// open main layer attribute table panel
404404
await page.locator('#attribute-layer-list button[value="triple_geom_geom"]').click();
405-
await getFeatureRequestPromise;
405+
await datatablesRequestPromise;
406406

407407
let triple_geom_geom_attr_table_head = page.locator("#attribute-layer-table-triple_geom_geom_wrapper .dataTables_scrollHead table");
408408
let triple_geom_geom_attr_table = page.locator("#attribute-layer-table-triple_geom_geom");
@@ -438,7 +438,7 @@ test.describe('Multiple geometry layers', () => {
438438
await page.locator('#nav-tab-attribute-summary').click();
439439
await page.locator('#attribute-layer-list button[value="triple_geom_geom_l"]').click();
440440

441-
await getFeatureRequestPromise;
441+
await datatablesRequestPromise;
442442

443443
let triple_geom_geom_l_attr_table_head = page.locator("#attribute-layer-table-triple_geom_geom_l_wrapper .dataTables_scrollHead table");
444444
let triple_geom_geom_l_attr_table = page.locator("#attribute-layer-table-triple_geom_geom_l");
@@ -473,7 +473,7 @@ test.describe('Multiple geometry layers', () => {
473473
await page.locator('#nav-tab-attribute-summary').click();
474474
await page.locator('#attribute-layer-list button[value="triple_geom_geom_p"]').click();
475475

476-
await getFeatureRequestPromise;
476+
await datatablesRequestPromise;
477477

478478
let triple_geom_geom_p_attr_table_head = page.locator("#attribute-layer-table-triple_geom_geom_p_wrapper .dataTables_scrollHead table");
479479
let triple_geom_geom_p_attr_table = page.locator("#attribute-layer-table-triple_geom_geom_p");

‎tests/end2end/playwright/media.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ test.describe('Media', () => {
1919
// Open the attribute table
2020
const project = new ProjectPage(page, 'form_edition_all_field_type');
2121
await project.open();
22-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
22+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
2323

2424
await project.openAttributeTable('form_edition_upload');
25-
await getFeatureRequestPromise;
25+
await datatablesRequestPromise;
2626

2727
await page.getByRole('row', { name: '2 text_file_mandatory' }).getByRole('button').nth(2);
2828

‎tests/end2end/playwright/n_to_m_relations.spec.js‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,21 @@ test.describe('N to M relations', () => {
1414
// maximize panel
1515
await page.getByRole('button', { name: 'Maximize' }).click();
1616

17-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
17+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
1818

1919
// open main layer attribute table panel
2020
await page.locator('#attribute-layer-list button[value="natural_areas"]').click();
21-
await getFeatureRequestPromise;
21+
await datatablesRequestPromise;
2222

2323
// open birds spots attribute table panel
24-
let birdSpotRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
2524
await page.locator('#nav-tab-attribute-summary').click();
2625
await page.locator('#attribute-layer-list button[value="birds_spots"]').click();
27-
await getFeatureRequestPromise;
26+
await datatablesRequestPromise;
2827

2928
// open birds attribute table panel
30-
let birdsRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
3129
await page.locator('#nav-tab-attribute-summary').click();
3230
await page.locator('#attribute-layer-list button[value="birds"]').click();
33-
await getFeatureRequestPromise;
31+
await datatablesRequestPromise;
3432

3533
//back to natural areas panel
3634
await page.locator('#nav-tab-attribute-layer-natural_areas').click();
@@ -67,9 +65,8 @@ test.describe('N to M relations', () => {
6765
await expect(page.locator("#nav-tab-attribute-child-tab-natural_areas-birds_spots")).toHaveCount(1);
6866

6967
// click on first row of main table and open "m" layer attribute table
70-
let firstChildRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
7168
await attrTable.locator("tbody tr").nth(0).click();
72-
await getFeatureRequestPromise;
69+
await datatablesRequestPromise;
7370

7471
let nRelatedAttrTable = page.locator("#attribute-layer-table-natural_areas-birds");
7572
await expect(attrTable).toHaveCount(1);
@@ -100,9 +97,8 @@ test.describe('N to M relations', () => {
10097
}
10198

10299
// change main record
103-
let secondChildRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
104100
await attrTable.locator("tbody tr").nth(1).click();
105-
await getFeatureRequestPromise;
101+
await datatablesRequestPromise;
106102

107103
// inspect new list of birds
108104
await expect(nRelatedAttrTable.locator("tbody tr")).toHaveCount(3);
@@ -126,11 +122,6 @@ test.describe('N to M relations', () => {
126122
await expect(featToolbar.locator(".feature-toolbar button[data-bs-title='Create feature']")).toBeHidden();
127123
}
128124

129-
// back to first record
130-
//let backToFirstChildRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
131-
//await attrTable.locator("tbody tr").nth(0).click();
132-
//await getFeatureRequestPromise;
133-
134125
// change tab to inspect bird spots (1:n control)
135126
await page.locator("#nav-tab-attribute-child-tab-natural_areas-birds_spots").click();
136127

@@ -251,9 +242,8 @@ test.describe('N to M relations', () => {
251242
await expect(birdsTable.locator("tbody tr").nth(8).locator("td").nth(2)).toHaveText("Northern pintail");
252243

253244
// click on last inserted record and check child attribute table
254-
let naturalAreaChildPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
255245
await birdsTable.locator("tbody tr").nth(8).click();
256-
await getFeatureRequestPromise;
246+
await datatablesRequestPromise;
257247

258248
let childNaturalAreasTable = page.locator("#attribute-layer-table-birds-natural_areas");
259249
await expect(childNaturalAreasTable.locator("tbody tr")).toHaveCount(1);

‎tests/end2end/playwright/webdav-upload.spec.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ test.describe('WebDAV Server', () => {
3131

3232
let id = await page.locator('#jforms_view_edition_id').inputValue();
3333

34-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
34+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
3535
await page.locator("#button-attributeLayers").click();
3636
await page.locator("button[value='form_edition_upload_webdav']").click();
37-
await getFeatureRequestPromise;
37+
await datatablesRequestPromise;
3838

3939
let attrTable = page.locator("#attribute-layer-table-form_edition_upload_webdav");
4040
await expect(attrTable).toHaveCount(1);
@@ -51,10 +51,10 @@ test.describe('WebDAV Server', () => {
5151

5252
test('Keep same file after reopen form, inspect attribute table', async ({ page }) => {
5353

54-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
54+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
5555
await page.locator("#button-attributeLayers").click();
5656
await page.locator("button[value='form_edition_upload_webdav_geom']").click();
57-
await getFeatureRequestPromise;
57+
await datatablesRequestPromise;
5858

5959
let attrTable = page.locator("#attribute-layer-table-form_edition_upload_webdav_geom");
6060
await expect(attrTable).toHaveCount(1);
@@ -100,10 +100,10 @@ test.describe('WebDAV Server', () => {
100100

101101
let id = await page.locator('#jforms_view_edition_id').inputValue();
102102

103-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
103+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
104104
await page.locator("#button-attributeLayers").click();
105105
await page.locator("button[value='form_edition_upload_webdav']").click();
106-
await getFeatureRequestPromise;
106+
await datatablesRequestPromise;
107107

108108
let attrTable = page.locator("#attribute-layer-table-form_edition_upload_webdav");
109109
await expect(attrTable).toHaveCount(1);
@@ -127,7 +127,7 @@ test.describe('WebDAV Server', () => {
127127

128128
await editFeatureRequestPromise;
129129

130-
await getFeatureRequestPromise;
130+
await datatablesRequestPromise;
131131

132132
await page.waitForTimeout(300);
133133

@@ -158,10 +158,10 @@ test.describe('WebDAV Server', () => {
158158

159159
let id = await page.locator('#jforms_view_edition_id').inputValue();
160160

161-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
161+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
162162
await page.locator("#button-attributeLayers").click();
163163
await page.locator("button[value='form_edition_upload_webdav']").click();
164-
await getFeatureRequestPromise;
164+
await datatablesRequestPromise;
165165

166166
let attrTable = page.locator("#attribute-layer-table-form_edition_upload_webdav");
167167
await expect(attrTable).toHaveCount(1);
@@ -184,7 +184,7 @@ test.describe('WebDAV Server', () => {
184184

185185
await editFeatureRequestPromise;
186186

187-
await getFeatureRequestPromise;
187+
await datatablesRequestPromise;
188188

189189
await page.waitForTimeout(300);
190190

@@ -219,10 +219,10 @@ test.describe('WebDAV Server', () => {
219219
//clear screen
220220
await page.locator('#dock-close').click();
221221

222-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
222+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
223223
await page.locator("#button-attributeLayers").click();
224224
await page.locator("button[value='form_edition_upload_webdav_geom']").click();
225-
await getFeatureRequestPromise;
225+
await datatablesRequestPromise;
226226

227227
let attrTable = page.locator("#attribute-layer-table-form_edition_upload_webdav_geom");
228228
await expect(attrTable).toHaveCount(1);
@@ -260,10 +260,10 @@ test.describe('WebDAV Server', () => {
260260
//clear screen
261261
await page.locator('#dock-close').click();
262262

263-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
263+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
264264
await page.locator("#button-attributeLayers").click();
265265
await page.locator("button[value='form_edition_upload_webdav_shape']").click();
266-
await getFeatureRequestPromise;
266+
await datatablesRequestPromise;
267267

268268
let attrTable = page.locator("#attribute-layer-table-form_edition_upload_webdav_shape");
269269
await expect(attrTable).toHaveCount(1);
@@ -273,11 +273,11 @@ test.describe('WebDAV Server', () => {
273273
})
274274

275275
test('GetMedia, different file type from webdav storage', async ({ page, request }) => {
276-
let getFeatureRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('GetFeature') === true);
276+
let datatablesRequestPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData()?.includes('draw') === true);
277277

278278
await page.locator("#button-attributeLayers").click();
279279
await page.locator("button[value='form_edition_upload_webdav_geom']").click();
280-
await getFeatureRequestPromise;
280+
await datatablesRequestPromise;
281281

282282
let attrTable = page.locator("#attribute-layer-table-form_edition_upload_webdav_geom");
283283

0 commit comments

Comments
 (0)