Tests - Renable OpenLayers test API

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

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/tests/end2end/playwright/custom-javascript-api.spec.js b/tests/end2end/playwright/custom-javascript-api.spec.js
@@ -1,26 +1,16 @@
 // @ts-check
 import { test, expect } from '@playwright/test';
-import { getAuthStorageStatePath, gotoMap } from './globals';
+import {ProjectPage} from "./pages/project.js";
 
 test.describe('Maps management', () => {
 
-    test.use({ storageState: getAuthStorageStatePath('admin') });
-
     test('OpenLayers', {
-        tag: '@flaky',
+        tag: '@readonly',
     }, async ({ page }) => {
-        // Allow themes/javascript codes for tests repository
-        await page.goto('admin.php');
-        await page.getByRole('link', { name: 'Maps management' }).click();
-        await page.getByRole('link', { name: 'Modify' }).first().click();
-        await page.getByText('Allow themes/javascript codes for this repository', { exact: true }).click();
-        await page.getByRole('button', { name: 'Save' }).click();
-
-        await page.goto('index.php');
-
-        const url = '/index.php/view/map/?repository=testsrepository&project=world-3857';
-        await gotoMap(url, page)
+        const project = new ProjectPage(page, 'world-3857');
+        await project.open();
 
+        await expect(page.locator('body')).toHaveAttribute("data-lizmap-user-defined-js-count", "1");
         await page.evaluate(() => { addOlLayers() })
         await page.waitForTimeout(1000);
         await expect(page.getByText('wms4326')).toBeVisible();
@@ -32,14 +22,5 @@ test.describe('Maps management', () => {
         await expect(page.getByText('wms4326')).not.toBeVisible();
         await expect(page.getByText('states')).not.toBeVisible();
         await expect(page.getByText('VectorTile')).not.toBeVisible();
-
-        // Disallow themes/javascript codes for tests repository
-        await page.goto('admin.php');
-        await page.getByRole('link', { name: 'Maps management' }).click();
-        await page.getByRole('link', { name: 'Modify' }).first().click();
-        await page.getByText('Allow themes/javascript codes for this repository', { exact: true }).click();
-        await page.getByRole('button', { name: 'Save' }).click();
-
-        await page.goto('index.php');
     })
 })
diff --git a/tests/end2end/playwright/maps-management.spec.js b/tests/end2end/playwright/maps-management.spec.js
@@ -135,7 +135,7 @@ test.describe('Maps management', () => {
         await expect(page.locator('[id=jforms_admin_config_section_label]')).toHaveValue('Tests repository');
         await expect(page.locator('[id=jforms_admin_config_section_repository]')).not.toBeEditable();
         await expect(page.locator('[id=jforms_admin_config_section_repository]')).toHaveAttribute('value', 'testsrepository');
-        await expect(page.locator('[id=jforms_admin_config_section_allowUserDefinedThemes]')).not.toBeChecked();
+        await expect(page.locator('[id=jforms_admin_config_section_allowUserDefinedThemes]')).toBeChecked();
         await expect(page.locator('[id=jforms_admin_config_section_accessControlAllowOrigin]')).toHaveValue('http://othersite.local:8130');
 
         // Check default rights on repository