WORLDSERVICE-346 - Remove amp from Homepage regex (#12401)

* remove amp from homepage regex * update snapshots * remove kyrgyz homepage from amp validator test * amp test deletions * another amp test file deletion * filter paths to exclude homepage urls from amp tests * refactor filter logic to exclude homepage urls * addressing code comments
bbc · Feb 13, 2025 · 5558674 · 5558674
1 parent d81ce95
commit 5558674
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 2,886 deletions.
diff --git a/cypress/e2e/pages/homePage/testsForAMPOnly.js b/cypress/e2e/pages/homePage/testsForAMPOnly.js
diff --git a/cypress/e2e/specialFeatures/cookieBanner/index.cy.js b/cypress/e2e/specialFeatures/cookieBanner/index.cy.js
@@ -45,6 +45,8 @@ Object.keys(config)
   .filter(service => serviceFilter(service))
   .forEach(service => {
     const { variant } = config[service];
+    const variantPath = variant === 'default' ? '' : `/${variant}`;
+    const isHomePagePath = path => path === `/${service}${variantPath}`;
 
     const paths = getPaths(service);
     paths.forEach(path => {
@@ -56,6 +58,7 @@ Object.keys(config)
     });
 
     paths
+      .filter(path => !isHomePagePath(path))
       .map(path => `${path}.amp`)
       .forEach(path => {
         if (!urlsToExcludeFromAmpTests.some(url => path.includes(url))) {

diff --git a/scripts/ampHtmlValidator/index.js b/scripts/ampHtmlValidator/index.js
@@ -60,10 +60,8 @@ const runValidator = async () => {
     .flat()
     .filter(url => !excludedUrls.includes(url));
 
-  // include kyrgyz homepage in amp validator tests
   const urlsToValidate = [
     ...urls,
-    '/kyrgyz',
     '/mundo/articles/ce42wzqr2mko',
     '/news/articles/cn7k01xp8kxo',
     '/persian/articles/cej3lzd5e0go',

diff --git a/src/app/routes/utils/regex/utils/__snapshots__/index.test.js.snap b/src/app/routes/utils/regex/utils/__snapshots__/index.test.js.snap
@@ -28,9 +28,9 @@ exports[`regex utils snapshots should create expected regex from getFrontPageReg
 
 exports[`regex utils snapshots should create expected regex from getFrontPageRegex when isLive = true 1`] = `"/:service(archive|cymrufyw|naidheachdan|news|newsround|scotland|sport|ukchina|ws):variant(/simp|/trad|/cyr|/lat)?:amp(.amp)?:lite(.lite)?"`;
 
-exports[`regex utils snapshots should create expected regex from getHomePageRegex when isLive = false 1`] = `"/:service(afaanoromoo|afrique|amharic|arabic|archive|azeri|bengali|burmese|cymrufyw|gahuza|gujarati|hausa|hindi|igbo|indonesia|japanese|korean|kyrgyz|marathi|mundo|naidheachdan|nepali|news|newsround|pashto|persian|pidgin|portuguese|punjabi|russian|scotland|serbian|sinhala|somali|sport|swahili|tamil|telugu|thai|tigrinya|turkce|ukchina|ukrainian|urdu|uzbek|vietnamese|ws|yoruba|zhongwen):variant(/simp|/trad|/cyr|/lat)?:amp(.amp)?:lite(.lite)?"`;
+exports[`regex utils snapshots should create expected regex from getHomePageRegex when isLive = false 1`] = `"/:service(afaanoromoo|afrique|amharic|arabic|archive|azeri|bengali|burmese|cymrufyw|gahuza|gujarati|hausa|hindi|igbo|indonesia|japanese|korean|kyrgyz|marathi|mundo|naidheachdan|nepali|news|newsround|pashto|persian|pidgin|portuguese|punjabi|russian|scotland|serbian|sinhala|somali|sport|swahili|tamil|telugu|thai|tigrinya|turkce|ukchina|ukrainian|urdu|uzbek|vietnamese|ws|yoruba|zhongwen):variant(/simp|/trad|/cyr|/lat)?:lite(.lite)?"`;
 
-exports[`regex utils snapshots should create expected regex from getHomePageRegex when isLive = true 1`] = `"/:service(afaanoromoo|afrique|amharic|arabic|azeri|bengali|burmese|gahuza|gujarati|hausa|hindi|igbo|indonesia|japanese|korean|kyrgyz|marathi|mundo|nepali|pashto|persian|pidgin|portuguese|punjabi|russian|serbian|sinhala|somali|swahili|tamil|telugu|thai|tigrinya|turkce|ukrainian|urdu|uzbek|vietnamese|yoruba|zhongwen):variant(/simp|/trad|/cyr|/lat)?:amp(.amp)?:lite(.lite)?"`;
+exports[`regex utils snapshots should create expected regex from getHomePageRegex when isLive = true 1`] = `"/:service(afaanoromoo|afrique|amharic|arabic|azeri|bengali|burmese|gahuza|gujarati|hausa|hindi|igbo|indonesia|japanese|korean|kyrgyz|marathi|mundo|nepali|pashto|persian|pidgin|portuguese|punjabi|russian|serbian|sinhala|somali|swahili|tamil|telugu|thai|tigrinya|turkce|ukrainian|urdu|uzbek|vietnamese|yoruba|zhongwen):variant(/simp|/trad|/cyr|/lat)?:lite(.lite)?"`;
 
 exports[`regex utils snapshots should create expected regex from getLegacyAssetRegex when isLive = false 1`] = `"/:service(afaanoromoo|afrique|amharic|arabic|archive|azeri|bengali|burmese|cymrufyw|gahuza|gujarati|hausa|hindi|igbo|indonesia|japanese|korean|kyrgyz|marathi|mundo|naidheachdan|nepali|news|newsround|pashto|persian|pidgin|portuguese|punjabi|russian|scotland|serbian|sinhala|somali|sport|swahili|tamil|telugu|thai|tigrinya|turkce|ukchina|ukrainian|urdu|uzbek|vietnamese|ws|yoruba|zhongwen):variant(/simp|/trad|/cyr|/lat)?/:assetUri([a-z0-9-_]{1,}/[a-z0-9-_/]{1,}):amp(.amp)?:lite(.lite)?"`;
 

diff --git a/src/app/routes/utils/regex/utils/index.js b/src/app/routes/utils/regex/utils/index.js
@@ -96,7 +96,7 @@ export const getHomePageRegex = services => {
     homePages = services.filter(service => homePageServices.includes(service));
   }
   const homePageServiceRegex = getServiceRegex(homePages);
-  return `/:service(${homePageServiceRegex}):variant(${variantRegex})?:amp(${ampRegex})?:lite(${liteRegex})?`;
+  return `/:service(${homePageServiceRegex}):variant(${variantRegex})?:lite(${liteRegex})?`;
 };
 
 export const getSwRegex = services => {

diff --git a/src/integration/pages/homePage/ampTests.js b/src/integration/pages/homePage/ampTests.js