Tests - Use more expectParametersToContain and toHaveLength

3liz · Feb 10, 2025 · 3ce0a3a · 3ce0a3a
1 parent d456053
commit 3ce0a3a
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 39 deletions.
diff --git a/tests/end2end/playwright/map-projects-switcher.spec.js b/tests/end2end/playwright/map-projects-switcher.spec.js
@@ -1,6 +1,6 @@
 // @ts-check
 import { test, expect } from '@playwright/test';
-import { getAuthStorageStatePath, gotoMap } from './globals';
+import {expectParametersToContain, getAuthStorageStatePath, gotoMap} from './globals';
 
 test.describe('Map projects switcher', () => {
 
@@ -34,19 +34,22 @@ test.describe('Map projects switcher', () => {
         await expect(page.locator('#_projectSwitcher')).toHaveText('Off');
     })
 
-    test('Switcher form map to map', async ({ page }) => {
+    test('Switcher from map to map', async ({ page }) => {
         await gotoMap('index.php/view/map?repository=testsrepository&project=base_layers', page);
 
         // Check scale
         await expect(page.locator('#overview-bar .ol-scale-text')).toHaveText('1 : ' + (144448).toLocaleString(locale));
 
-        // Go to an other map
+        // Go to another map
         await page.locator('#button-projects').click();
         await page.locator('li').filter({ hasText: 'base_layers_user_defined' }).getByRole('link').nth(1).click();
 
         let checked_url = new URL(page.url());
-        await expect(checked_url.searchParams.get('repository')).toBe('testsrepository')
-        await expect(checked_url.searchParams.get('project')).toBe('base_layers_user_defined')
+        let expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'base_layers_user_defined',
+        }
+        await expectParametersToContain('GetMap', checked_url, expectedParameters);
         await expect(checked_url.hash).toHaveLength(0);
 
         // Zoom in
@@ -64,8 +67,11 @@ test.describe('Map projects switcher', () => {
         await page.waitForTimeout(1000);
 
         checked_url = new URL(page.url());
-        await expect(checked_url.searchParams.get('repository')).toBe('testsrepository')
-        await expect(checked_url.searchParams.get('project')).toBe('base_layers')
+        expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'base_layers',
+        }
+        await expectParametersToContain('GetMap', checked_url, expectedParameters);
         await expect(checked_url.hash).not.toHaveLength(0);
         await expect(checked_url.hash).toMatch(/^#3\.838\d+,43\.5883\d+,3\.912\d+,43\.6241\d+/)
 
@@ -89,8 +95,11 @@ test.describe('Map projects switcher', () => {
         await page.waitForTimeout(1000);
 
         checked_url = new URL(page.url());
-        await expect(checked_url.searchParams.get('repository')).toBe('testsrepository')
-        await expect(checked_url.searchParams.get('project')).toBe('attribute_table')
+        expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'attribute_table',
+        }
+        await expectParametersToContain('GetMap', checked_url, expectedParameters);
         await expect(checked_url.hash).not.toHaveLength(0);
         await expect(checked_url.hash).toMatch(/^#3\.8007\d+,43\.570\d+,3\.950\d+,43\.6419\d+/)
 
@@ -118,8 +127,11 @@ test.describe('Map projects switcher', () => {
         await page.waitForTimeout(1000);
 
         checked_url = new URL(page.url());
-        await expect(checked_url.searchParams.get('repository')).toBe('testsrepository')
-        await expect(checked_url.searchParams.get('project')).toBe('base_layers_user_defined')
+        expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'base_layers_user_defined',
+        }
+        await expectParametersToContain('GetMap', checked_url, expectedParameters);
         await expect(checked_url.hash).toMatch(/^#3\.8611\d+,43\.599\d+,3\.8898\d+,43\.6132\d+/)
 
         // Wait for OL transition
@@ -141,8 +153,11 @@ test.describe('Map projects switcher', () => {
         await page.waitForTimeout(1000);
 
         checked_url = new URL(page.url());
-        await expect(checked_url.searchParams.get('repository')).toBe('testsrepository')
-        await expect(checked_url.searchParams.get('project')).toBe('base_layers')
+        expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'base_layers',
+        }
+        await expectParametersToContain('GetMap', checked_url, expectedParameters);
         await expect(checked_url.hash).toHaveLength(0);
 
         // Check scale

diff --git a/tests/end2end/playwright/permalink.spec.js b/tests/end2end/playwright/permalink.spec.js
@@ -32,7 +32,11 @@ test.describe('Permalink', () => {
         const share_value = await page.locator('#input-share-permalink').inputValue();
         const share_url = new URL(share_value);
         await expect(share_url.pathname).toBe('/index.php/view/map')
-        await expect(share_url.search).toBe('?repository=testsrepository&project=layer_legends')
+        const expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'layer_legends',
+        }
+        await expectParametersToContain('URL', checked_url, expectedParameters);
         await expect(share_url.hash).toMatch(/#3.5148\d+,43.4213\d+,4.2324\d+,43.7692\d+|/)
         await expect(share_url.hash).toContain('|layer_legend_single_symbol,layer_legend_categorized,layer_legend_ruled,tramway_lines,legend_option_test|d%C3%A9faut,d%C3%A9faut,d%C3%A9faut,a_single,|1,1,1,1,1')
     });
@@ -75,7 +79,11 @@ test.describe('Permalink', () => {
         const share_value = await page.locator('#input-share-permalink').inputValue();
         const share_url = new URL(share_value);
         await expect(share_url.pathname).toBe('/index.php/view/map')
-        await expect(share_url.search).toBe('?repository=testsrepository&project=permalink')
+        const expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'permalink',
+        }
+        await expectParametersToContain('URL', checked_url, expectedParameters);
         await expect(share_url.hash).toMatch(/#3.798064\d+,43.597569\d+,3.904383\d+,43.672963\d+\|/)
         await expect(share_url.hash).toContain('|sousquartiers,Les%20quartiers%20%C3%A0%20Montpellier|red,d%C3%A9faut|0.6,0.8')
     });
@@ -601,7 +609,11 @@ test.describe('Automatic permalink disabled', () => {
         const share_value = await page.locator('#input-share-permalink').inputValue();
         const share_url = new URL(share_value);
         await expect(share_url.pathname).toBe('/index.php/view/map')
-        await expect(share_url.search).toBe('?repository=testsrepository&project=layer_legends')
+        const expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'layer_legends',
+        }
+        await expectParametersToContain('URL', checked_url, expectedParameters);
         await expect(share_url.hash).toMatch(/#3.5148\d+,43.4213\d+,4.2324\d+,43.7692\d+|/)
         await expect(share_url.hash).toContain('|layer_legend_single_symbol,layer_legend_categorized,layer_legend_ruled,tramway_lines,legend_option_test|d%C3%A9faut,d%C3%A9faut,d%C3%A9faut,a_single,|1,1,1,1,1')
     });
@@ -644,7 +656,11 @@ test.describe('Automatic permalink disabled', () => {
         const share_value = await page.locator('#input-share-permalink').inputValue();
         const share_url = new URL(share_value);
         await expect(share_url.pathname).toBe('/index.php/view/map')
-        await expect(share_url.search).toBe('?repository=testsrepository&project=permalink')
+        const expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'permalink',
+        }
+        await expectParametersToContain('URL', checked_url, expectedParameters);
         await expect(share_url.hash).toMatch(/#3.798064\d+,43.597569\d+,3.904383\d+,43.672963\d+\|/)
         await expect(share_url.hash).toContain('|sousquartiers,Les%20quartiers%20%C3%A0%20Montpellier|red,d%C3%A9faut|0.6,0.8')
     });
@@ -689,7 +705,11 @@ test.describe('Automatic permalink disabled', () => {
         const share_value = await page.locator('#input-share-permalink').inputValue();
         const share_url = new URL(share_value);
         await expect(share_url.pathname).toBe('/index.php/view/map')
-        await expect(share_url.search).toBe('?repository=testsrepository&project=layer_legends')
+        const expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'layer_legends',
+        }
+        await expectParametersToContain('URL', checked_url, expectedParameters);
         await expect(share_url.hash).toMatch(/#3.45433\d+,43.48926\d+,4.17242\d+,43.8367\d+\|/)
         await expect(share_url.hash).toContain('|layer_legend_single_symbol,layer_legend_categorized,layer_legend_ruled,tramway_lines,legend_option_test,Group%20as%20layer|d%C3%A9faut,d%C3%A9faut,d%C3%A9faut,categorized,,|0.6,1,1,1,1,1')
     });
@@ -721,7 +741,7 @@ test.describe('BBox parameter', () => {
         const getMapPromise = page.waitForRequest(/GetMap/);
         await page.getByLabel('sousquartiers').check();
         const getMapRequest = await getMapPromise;
-        const expectedParameters = {
+        let expectedParameters = {
             'SERVICE': 'WMS',
             'VERSION': '1.3.0',
             'REQUEST': 'GetMap',
@@ -740,7 +760,11 @@ test.describe('BBox parameter', () => {
         const new_share_value = await page.locator('#input-share-permalink').inputValue();
         const new_share_url = new URL(new_share_value);
         await expect(new_share_url.pathname).toBe('/index.php/view/map')
-        await expect(new_share_url.search).toBe('?repository=testsrepository&project=permalink')
+        expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'permalink',
+        }
+        await expectParametersToContain('URL', checked_url, expectedParameters);
         await expect(new_share_url.hash).toMatch(/#3.77950\d+,43.60047\d+,3.92309\d+,43.67003\d+\|/)
         await expect(new_share_url.hash).toContain('|sousquartiers|d%C3%A9faut|1')
     });
@@ -770,7 +794,7 @@ test.describe('BBox parameter', () => {
         const getMapPromise = page.waitForRequest(/GetMap/);
         await page.getByLabel('sousquartiers').check();
         const getMapRequest = await getMapPromise;
-        const expectedParameters = {
+        let expectedParameters = {
             'SERVICE': 'WMS',
             'VERSION': '1.3.0',
             'REQUEST': 'GetMap',
@@ -789,7 +813,11 @@ test.describe('BBox parameter', () => {
         const new_share_value = await page.locator('#input-share-permalink').inputValue();
         const new_share_url = new URL(new_share_value);
         await expect(new_share_url.pathname).toBe('/index.php/view/map')
-        await expect(new_share_url.search).toBe('?repository=testsrepository&project=permalink')
+        expectedParameters = {
+            'REPOSITORY': 'testsrepository',
+            'PROJECT': 'permalink',
+        }
+        await expectParametersToContain('URL', checked_url, expectedParameters);
         await expect(new_share_url.hash).toMatch(/#3.77950\d+,43.60047\d+,3.92309\d+,43.67003\d+\|/)
         await expect(new_share_url.hash).toContain('|sousquartiers|d%C3%A9faut|1')
     });

diff --git a/tests/end2end/playwright/print.spec.js b/tests/end2end/playwright/print.spec.js
@@ -78,7 +78,7 @@ test.describe('Print', () => {
             // 'multiline_label': 'Multiline label',
         })
         let getPrintParams = await expectParametersToContain('Print requests 1', getPrintRequest.postData() ?? '', expectedParameters1)
-        await expect(getPrintParams.size).toBe(15)
+        await expect(getPrintParams).toHaveLength(15)
 
         // Close message
         await page.locator('.btn-close').click();
@@ -101,7 +101,7 @@ test.describe('Print', () => {
             'map0:OPACITIES': '204,255,255',
         })
         getPrintParams = await expectParametersToContain('Print requests 2', getPrintRequest.postData() ?? '', expectedParameters2)
-        await expect(getPrintParams.size).toBe(13)
+        await expect(getPrintParams).toHaveLength(13)
 
         // Test `print_overview` template
         await page.locator('#print-template').selectOption('2');
@@ -127,7 +127,7 @@ test.describe('Print', () => {
             'map0:EXTENT': /761864.\d+,6274266.\d+,779334.\d+,6284518.\d+/,
         })
         getPrintParams = await expectParametersToContain('Print requests 3', getPrintRequest.postData() ?? '', expectedParameters3)
-        await expect(getPrintParams.size).toBe(14)
+        await expect(getPrintParams).toHaveLength(14)
 
         // Redlining with circle
         await page.locator('#button-draw').click();
@@ -196,7 +196,7 @@ test.describe('Print', () => {
         })
         /* eslint-enable no-useless-escape */
         getPrintParams = await expectParametersToContain('Print requests 4', getPrintRequest.postData() ?? '', expectedParameters4)
-        await expect(getPrintParams.size).toBe(17)
+        await expect(getPrintParams).toHaveLength(17)
     });
 
     test('Print requests with selection', async ({ page }) => {
@@ -235,7 +235,7 @@ test.describe('Print', () => {
             'SELECTIONTOKEN': /[a-z\d]+/,
         }
         const getPrintParams = await expectParametersToContain('Print requests with selection', getPrintRequest.postData() ?? '', expectedParameters)
-        await expect(getPrintParams.size).toBe(16)
+        await expect(getPrintParams).toHaveLength(16)
     });
 
     test('Print requests with filter', async ({ page }) => {
@@ -284,7 +284,7 @@ test.describe('Print', () => {
             'FILTERTOKEN': /[a-z\d]+/,
         }
         const getPrintParams = await expectParametersToContain('Print requests with filter', getPrintRequest.postData() ?? '', expectedParameters)
-        await expect(getPrintParams.size).toBe(16)
+        await expect(getPrintParams).toHaveLength(16)
     });
 });
 
@@ -339,7 +339,7 @@ test.describe('Print in popup', () => {
             'EXP_FILTER': '$id IN (1)',
         }
         const getPrintParams = await expectParametersToContain('Atlas print in popup requests', getPrintRequest.postData() ?? '', expectedParameters)
-        await expect(getPrintParams.size).toBe(10)
+        await expect(getPrintParams).toHaveLength(10)
         await expect(getPrintParams.has('CRS')).toBe(false)
         await expect(getPrintParams.has('LAYERS')).toBe(false)
         await expect(getPrintParams.has('ATLAS_PK')).toBe(false)
@@ -521,7 +521,7 @@ test.describe('Print 3857', () => {
             // 'multiline_label': 'Multiline label',
         })
         let getPrintParams = await expectParametersToContain('Print requests 1', getPrintRequest.postData() ?? '', expectedParameters1)
-        await expect(getPrintParams.size).toBe(15)
+        await expect(getPrintParams).toHaveLength(15)
 
         // Test `print_map` template
         await page.locator('#print-template').selectOption('1');
@@ -548,7 +548,7 @@ test.describe('Print 3857', () => {
             'map0:OPACITIES': '204,255,255',
         })
         getPrintParams = await expectParametersToContain('Print requests 2', getPrintRequest.postData() ?? '', expectedParameters2)
-        await expect(getPrintParams.size).toBe(13)
+        await expect(getPrintParams).toHaveLength(13)
 
         // Close message
         await page.locator('.btn-close').click();
@@ -619,7 +619,7 @@ test.describe('Print 3857', () => {
         })
         /* eslint-enable no-useless-escape */
         getPrintParams = await expectParametersToContain('Print requests 3', getPrintRequest.postData() ?? '', expectedParameters3)
-        await expect(getPrintParams.size).toBe(17)
+        await expect(getPrintParams).toHaveLength(17)
     });
 });
 
@@ -666,7 +666,7 @@ test.describe('Print base layers', () => {
             'map0:OPACITIES': '255',
         })
         let getPrintParams = await expectParametersToContain('Print requests 1', getPrintRequest.postData() ?? '', expectedParameters1)
-        await expect(getPrintParams.size).toBe(13)
+        await expect(getPrintParams).toHaveLength(13)
 
         let getPrintResponse = await getPrintRequest.response();
         await expect(getPrintResponse?.status()).toBe(200)
@@ -696,7 +696,7 @@ test.describe('Print base layers', () => {
             'map0:OPACITIES': '255,255',
         })
         getPrintParams = await expectParametersToContain('Print requests 2', getPrintRequest.postData() ?? '', expectedParameters2)
-        await expect(getPrintParams.size).toBe(13)
+        await expect(getPrintParams).toHaveLength(13)
 
         getPrintResponse = await getPrintRequest.response();
         await expect(getPrintResponse?.status()).toBe(200)
@@ -725,7 +725,7 @@ test.describe('Print base layers', () => {
             'map0:OPACITIES': '255',
         })
         getPrintParams = await expectParametersToContain('Print requests 3', getPrintRequest.postData() ?? '', expectedParameters3)
-        await expect(getPrintParams.size).toBe(13)
+        await expect(getPrintParams).toHaveLength(13)
 
         getPrintResponse = await getPrintRequest.response();
         await expect(getPrintResponse?.status()).toBe(200)
@@ -754,7 +754,7 @@ test.describe('Print base layers', () => {
             'map0:OPACITIES': '255,255',
         })
         getPrintParams = await expectParametersToContain('Print requests 4', getPrintRequest.postData() ?? '', expectedParameters4)
-        await expect(getPrintParams.size).toBe(13)
+        await expect(getPrintParams).toHaveLength(13)
 
         getPrintResponse = await getPrintRequest.response();
         await expect(getPrintResponse?.status()).toBe(200)

diff --git a/tests/end2end/playwright/print_in_project_projection.spec.js b/tests/end2end/playwright/print_in_project_projection.spec.js
@@ -99,7 +99,7 @@ test.describe('Print in project projection', () => {
             // 'multiline_label': 'Multiline label',
         }
         const getPrintParams = await expectParametersToContain('Print external baselayer', getPrintRequest.postData() ?? '', expectedParameters)
-        await expect(getPrintParams.size).toBe(14)
+        await expect(getPrintParams).toHaveLength(14)
         await getPrintRequest.response()
         await page.unroute('**/service*')
     })

diff --git a/tests/end2end/playwright/timemanage.spec.js b/tests/end2end/playwright/timemanage.spec.js
@@ -62,8 +62,14 @@ test.describe('Time Manager', () => {
             ];
             // Check if WMS Request params are as expected
             for (let obj of expectedParamValue) {
-                await expect(urlObj.has(obj.param), obj.param+' not in ['+Array.from(urlObj.keys()).join(', ')+']').toBeTruthy();
-                await expect(urlObj.get(obj.param), obj.param+'='+obj.expectedvalue+' not in ['+urlObj.toString().split('&').join(', ')+']').toBe(obj.expectedvalue);
+                await expect(
+                    urlObj.has(obj.param),
+                    obj.param+' not in ['+Array.from(urlObj.keys()).join(', ')+']'
+                ).toBeTruthy();
+                await expect(
+                    urlObj.get(obj.param),
+                    obj.param+'='+obj.expectedvalue+' not in ['+urlObj.toString().split('&').join(', ')+']'
+                ).toBe(obj.expectedvalue);
             }
         }