fix regex in tests

Geoportail-Luxembourg · Nov 27, 2024 · faacee2 · faacee2
1 parent 3532ef4
commit faacee2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/cypress/e2e/background-selection.cy.ts b/cypress/e2e/background-selection.cy.ts
@@ -1,3 +1,4 @@
+import { noMapLayerRegex } from './layers.utils'
 import type { AUTWindowOlMap } from '../types'
 
 describe('Background selector', () => {
@@ -22,7 +23,7 @@ describe('Background selector', () => {
       const layers = (<AUTWindowOlMap>window).olMap
         .getLayers()
         .getArray()
-        .filter((l: any) => !/feature(Edit)?Layer/.exec(l.get('cyLayerType')))
+        .filter((l: any) => !noMapLayerRegex.exec(l.get('cyLayerType')))
       expect(layers[0].get('id')).to.eq(556)
     })
 
@@ -52,7 +53,7 @@ describe('Background selector', () => {
         const layers = (<AUTWindowOlMap>window).olMap
           .getLayers()
           .getArray()
-          .filter((l: any) => !/feature(Edit)?Layer/.exec(l.get('cyLayerType')))
+          .filter((l: any) => !noMapLayerRegex.exec(l.get('cyLayerType')))
         expect(layers[0].get('id')).to.eq(502)
       })
     })

diff --git a/cypress/e2e/layers-selection/layers-selection-catalog.cy.ts b/cypress/e2e/layers-selection/layers-selection-catalog.cy.ts
@@ -1,3 +1,4 @@
+import { noMapLayerRegex } from '../layers.utils'
 import type { AUTWindowOlMap } from '../../types'
 
 describe('Catalogue', () => {
@@ -67,7 +68,11 @@ describe('Catalogue', () => {
         const layers = (<AUTWindowOlMap>window).olMap
           .getLayers()
           .getArray()
-          .filter((l: any) => !/feature(Edit)?Layer/.exec(l.get('cyLayerType')))
+          .filter(
+            (l: any) =>
+              // regex match
+              !noMapLayerRegex.exec(l.get('cyLayerType'))
+          )
         expect(layers[0].get('id')).to.eq(556)
       })
       cy.get('[data-cy="catalog"]')
@@ -81,7 +86,11 @@ describe('Catalogue', () => {
         const layers = (<AUTWindowOlMap>window).olMap
           .getLayers()
           .getArray()
-          .filter((l: any) => !/feature(Edit)?Layer/.exec(l.get('cyLayerType')))
+          .filter(
+            (l: any) =>
+              // regex match
+              !noMapLayerRegex.exec(l.get('cyLayerType'))
+          )
         expect(layers[0].get('id')).to.eq(359)
         expect(layers[1].get('id')).to.eq(353)
       })

diff --git a/cypress/e2e/layers.utils.ts b/cypress/e2e/layers.utils.ts
@@ -0,0 +1 @@
+export const noMapLayerRegex = /((info)|(sv))?[fF]eature(Edit)?Layer/
diff --git a/src/services/state-persistor/state-persistor-location-info.ts b/src/services/state-persistor/state-persistor-location-info.ts
@@ -44,7 +44,7 @@ class StatePersistorLocationInfo implements StatePersistorService {
     // This represents the behaviour in V3, where restoring from permalink
     // always displays the info of the map center
     // This is not a very logical behaviour ??
-    if (location !== 'false') {
+    if (location && location !== 'false') {
       locationInfo.value = map.getView().getCenter()
     }
   }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const noMapLayerRegex = /((info)\|(sv))?[fF]eature(Edit)?Layer/