fix: Added url check for unique map URLs (#23)

techmatters · Oct 1, 2024 · c1a49c1 · c1a49c1
1 parent eab82e8
commit c1a49c1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "lint-js": "eslint ./ --ext .js --ext .ts --ext .tsx --max-warnings 0 --ignore-pattern node_modules/ --ignore-pattern build/",
+    "lint-js": "eslint ./ --ext .js --ext .ts --ext .tsx --max-warnings 0 --ignore-pattern \"node_modules/, playwright-report/\" --ignore-pattern build/",
     "format-js": "npm run lint-js -- --fix"
   },
   "devDependencies": {

diff --git a/src/admin/adminGroupFormPage.ts b/src/admin/adminGroupFormPage.ts
@@ -12,7 +12,7 @@ export const confirmRemove = async (page: Page) => {
 
 export const removeGroup = async (page: Page, groupName: string) => {
   await groupListPage.goToPage(page);
-  await groupListPage.showAllGroups(page);
+  await groupListPage.showLatestGroups(page);
   await groupListPage.openGroup(page, groupName);
   await remove(page);
   await confirmRemove(page);

diff --git a/src/admin/adminGroupListPage.ts b/src/admin/adminGroupListPage.ts
@@ -6,11 +6,12 @@ export const goToPage = async (page: Page) => {
   await page.goto(`${ADMIN_URL}/core/group/`);
 };
 
-export const showAllGroups = async (page: Page) => {
-  const showAll = page.getByRole('link', { name: 'Show all' });
-  if ((await showAll.count()) > 0) {
-    await showAll.click();
-  }
+export const showLatestGroups = async (page: Page) => {
+  await page
+    .getByRole('link', {
+      name: /created at/i,
+    })
+    .click();
 };
 
 export const openGroup = async (page: Page, groupName: string) => {

diff --git a/src/sharedData/visualization/visualization.spec.ts b/src/sharedData/visualization/visualization.spec.ts
@@ -137,6 +137,7 @@ const testVisualizationForm = async ({
       clip: mapRegionBoundingBox,
     },
   );
+
   await page.getByRole('button', { name: 'Next' }).click();
 
   // Annotations
@@ -186,8 +187,10 @@ const testVisualizationForm = async ({
 
   // View page
   const url = new URL(page.url());
-  const expectedPathname = `/groups/${group.slug}/map/${visualizationSlug}`;
-  expect(url.pathname).toBe(expectedPathname);
+  const expectedPattern = new RegExp(
+    `/groups/${group.slug}/map/[\\w-]+/${visualizationSlug}`,
+  );
+  expect(url.pathname).toMatch(expectedPattern);
   await visualizationFormPage.changeBaseMap(page, 'Satellite');
 
   // Download file