From 1d1bc304e93d984f21202940903571fd4ae77ca5 Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Fri, 18 Oct 2024 17:51:51 +0200
Subject: [PATCH] Tests e2e playwright: Goto map cannot wait for
 GetLegendGraphics request

---
 tests/end2end/playwright/globals.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/end2end/playwright/globals.js b/tests/end2end/playwright/globals.js
index 2694f1e8c0..80d9a61048 100644
--- a/tests/end2end/playwright/globals.js
+++ b/tests/end2end/playwright/globals.js
@@ -1,10 +1,12 @@
 // @ts-check
 const { expect } = require('@playwright/test');
 
-async function NoErrors(page) {
+async function NoErrors(page, checkLayerTreeView = true) {
     // No error
     await expect(page.locator('p.error-msg')).toHaveCount(0);
-    await expect(page.locator('#switcher lizmap-treeview ul li')).not.toHaveCount(0);
+    if (checkLayerTreeView) {
+        await expect(page.locator('#switcher lizmap-treeview ul li')).not.toHaveCount(0);
+    }
     // Check no error message displayed
     await expect(page.getByText('An error occurred while loading this map. Some necessary resources may temporari')).toHaveCount(0);
 }
@@ -32,8 +34,9 @@ async function CatchErrors(page, layersInTreeView = 0) {
  * @param page The page object
  * @param boolean mapMustLoad If the loading of the map must be successful or not. Some error might be triggered when loading the map, on purpose.
  * @param int layersInTreeView The number of layers to find in the treeview if the map is on error.
+ * @param boolean waitForGetLegendGraphics
  */
-export async function gotoMap(url, page, mapMustLoad = true, layersInTreeView = 0) {
+export async function gotoMap(url, page, mapMustLoad = true, layersInTreeView = 0, waitForGetLegendGraphics = true) {
     // TODO keep this function synchronized with the Cypress equivalent
 
     // Wait for WMS GetCapabilities promise
@@ -43,13 +46,15 @@ export async function gotoMap(url, page, mapMustLoad = true, layersInTreeView =
     // Wait for WMS GetCapabilities
     await getCapabilitiesWMSPromise;
     if (mapMustLoad) {
-        // Wait for WMS GetLegendGraphic promise
-        const getLegendGraphicPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData() != null && request.postData()?.includes('GetLegendGraphic') === true);
-        // Normal check about the map
-        // Wait for WMS GetLegendGraphic
-        await getLegendGraphicPromise;
+        if (waitForGetLegendGraphics) {
+            // Wait for WMS GetLegendGraphic promise
+            const getLegendGraphicPromise = page.waitForRequest(request => request.method() === 'POST' && request.postData() != null && request.postData()?.includes('GetLegendGraphic') === true);
+            // Normal check about the map
+            // Wait for WMS GetLegendGraphic
+            await getLegendGraphicPromise;
+        }
         // No error
-        await NoErrors(page);
+        await NoErrors(page, waitForGetLegendGraphics);
         // Wait to be sure the map is ready
         await page.waitForTimeout(1000)
     } else {