From b1dcbb7a15f889549026d5441a3185655e0d1c93 Mon Sep 17 00:00:00 2001 From: louisearchibald Date: Wed, 27 Nov 2024 16:02:21 +0000 Subject: [PATCH 1/8] update test to add serbian and zhongwen to list of migrated services --- src/app/routes/utils/regex/index.test.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/routes/utils/regex/index.test.js b/src/app/routes/utils/regex/index.test.js index 10ffc3c8c5f..853129faa2b 100644 --- a/src/app/routes/utils/regex/index.test.js +++ b/src/app/routes/utils/regex/index.test.js @@ -531,6 +531,7 @@ describe('frontPage -> homePage migration', () => { 'portuguese', 'punjabi', 'russian', + 'serbian', 'sinhala', 'somali', 'swahili', @@ -543,6 +544,7 @@ describe('frontPage -> homePage migration', () => { 'urdu', 'vietnamese', 'yoruba', + 'zhongwen', ]; const migratedWorldServiceRoutes = migratedServices.map(serviceToRoute); From 1e99bd95106217cf1f16adeedb9c8f84f75c91ed Mon Sep 17 00:00:00 2001 From: louisearchibald Date: Wed, 27 Nov 2024 16:02:44 +0000 Subject: [PATCH 2/8] add serbian and zhongwen to list of migrated services --- src/app/routes/utils/regex/utils/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/routes/utils/regex/utils/index.js b/src/app/routes/utils/regex/utils/index.js index 0c6077452df..a8d3880c134 100644 --- a/src/app/routes/utils/regex/utils/index.js +++ b/src/app/routes/utils/regex/utils/index.js @@ -60,6 +60,7 @@ const homePageServices = [ 'portuguese', 'punjabi', 'russian', + 'serbian', 'sinhala', 'somali', 'swahili', @@ -72,6 +73,7 @@ const homePageServices = [ 'urdu', 'vietnamese', 'yoruba', + 'zhongwen', ]; export const getFrontPageRegex = services => { From ce69c94b46220f622d64f56f382fc72af363fc68 Mon Sep 17 00:00:00 2001 From: louisearchibald Date: Wed, 27 Nov 2024 16:25:38 +0000 Subject: [PATCH 3/8] updates snapshots --- .../routes/utils/regex/utils/__snapshots__/index.test.js.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 14eadcae0f4..9f4285aefad 100644 --- a/src/app/routes/utils/regex/utils/__snapshots__/index.test.js.snap +++ b/src/app/routes/utils/regex/utils/__snapshots__/index.test.js.snap @@ -26,11 +26,11 @@ exports[`regex utils snapshots should create expected regex from getErrorPageReg exports[`regex utils snapshots should create expected regex from getFrontPageRegex when isLive = false 1`] = `"/:service():variant(/simp|/trad|/cyr|/lat)?:amp(.amp)?:lite(.lite)?"`; -exports[`regex utils snapshots should create expected regex from getFrontPageRegex when isLive = true 1`] = `"/:service(archive|cymrufyw|naidheachdan|news|newsround|scotland|serbian|sport|ukchina|uzbek|ws|zhongwen):variant(/simp|/trad|/cyr|/lat)?:amp(.amp)?:lite(.lite)?"`; +exports[`regex utils snapshots should create expected regex from getFrontPageRegex when isLive = true 1`] = `"/:service(archive|cymrufyw|naidheachdan|news|newsround|scotland|sport|ukchina|uzbek|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 = 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|sinhala|somali|swahili|tamil|telugu|thai|tigrinya|turkce|ukrainian|urdu|vietnamese|yoruba):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|vietnamese|yoruba|zhongwen):variant(/simp|/trad|/cyr|/lat)?:amp(.amp)?: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)?"`; From c59c17c615f3ffa1d67a17be7cc5df2166bb889d Mon Sep 17 00:00:00 2001 From: louisearchibald Date: Thu, 28 Nov 2024 09:13:49 +0000 Subject: [PATCH 4/8] disable frontpage e2e tests for serbian --- cypress/support/config/settings.js | 32 +++--------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/cypress/support/config/settings.js b/cypress/support/config/settings.js index 81c8d475a8f..90f11e33680 100644 --- a/cypress/support/config/settings.js +++ b/cypress/support/config/settings.js @@ -5485,21 +5485,8 @@ module.exports = () => ({ smoke: true, }, frontPage: { - environments: { - live: { - paths: ['/serbian/cyr'], - enabled: true, - }, - test: { - paths: ['/serbian/cyr'], - enabled: false, - }, - local: { - paths: ['/serbian/cyr'], - enabled: false, - }, - }, - smoke: true, + environments: undefined, + smoke: false, }, liveRadio: { environments: undefined, smoke: false }, onDemandAudio: { environments: undefined, smoke: false }, @@ -5655,20 +5642,7 @@ module.exports = () => ({ smoke: true, }, frontPage: { - environments: { - live: { - paths: ['/serbian/lat'], - enabled: true, - }, - test: { - paths: ['/serbian/lat'], - enabled: false, - }, - local: { - paths: ['/serbian/lat'], - enabled: false, - }, - }, + environments: undefined, smoke: true, }, liveRadio: { environments: undefined, smoke: false }, From 0d88974bf0e8cabb98667b9acb74ec801e8d4475 Mon Sep 17 00:00:00 2001 From: louisearchibald Date: Thu, 28 Nov 2024 09:15:06 +0000 Subject: [PATCH 5/8] disable frontpage e2e tests for zhongwen --- cypress/support/config/settings.js | 34 ++++-------------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/cypress/support/config/settings.js b/cypress/support/config/settings.js index 90f11e33680..9fc221ca2df 100644 --- a/cypress/support/config/settings.js +++ b/cypress/support/config/settings.js @@ -8820,21 +8820,8 @@ module.exports = () => ({ smoke: true, }, frontPage: { - environments: { - live: { - paths: ['/zhongwen/simp'], - enabled: false, - }, - test: { - paths: ['/zhongwen/simp'], - enabled: false, - }, - local: { - paths: ['/zhongwen/simp'], - enabled: false, - }, - }, - smoke: true, + environments: undefined, + smoke: false, }, liveRadio: { environments: undefined, smoke: false }, onDemandAudio: { @@ -9027,21 +9014,8 @@ module.exports = () => ({ smoke: true, }, frontPage: { - environments: { - live: { - paths: ['/zhongwen/trad'], - enabled: false, - }, - test: { - paths: ['/zhongwen/trad'], - enabled: false, - }, - local: { - paths: ['/zhongwen/trad'], - enabled: false, - }, - }, - smoke: true, + environments: undefined, + smoke: false, }, liveRadio: { environments: undefined, smoke: false }, onDemandAudio: { From aef8394dd674db2f18d9627ab82d7b483488ab5c Mon Sep 17 00:00:00 2001 From: louisearchibald Date: Thu, 28 Nov 2024 09:17:21 +0000 Subject: [PATCH 6/8] add live url entry for a variant service --- cypress/e2e/pages/homePage/urls.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cypress/e2e/pages/homePage/urls.js b/cypress/e2e/pages/homePage/urls.js index 14866c41549..670d3826652 100644 --- a/cypress/e2e/pages/homePage/urls.js +++ b/cypress/e2e/pages/homePage/urls.js @@ -15,11 +15,13 @@ const urls = [ service: 'serbian', local: '/serbian/lat', test: '/serbian/lat', + live: '/serbian/lat', }, { service: 'serbian', local: '/serbian/cyr', test: '/serbian/cyr', + live: '/serbian/cyr', }, ]; From d48e14fea556344e22854fa0badbf8ca264a512b Mon Sep 17 00:00:00 2001 From: louisearchibald Date: Thu, 28 Nov 2024 09:23:07 +0000 Subject: [PATCH 7/8] delete frontpage entry lighthouse test --- lighthouse/lighthouserc.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lighthouse/lighthouserc.js b/lighthouse/lighthouserc.js index 4dbb904c7a8..b20752b5872 100644 --- a/lighthouse/lighthouserc.js +++ b/lighthouse/lighthouserc.js @@ -1,8 +1,4 @@ const AUDIT_URLS = { - FRONT_PAGE: { - live: ['https://www.bbc.com/serbian/cyr'], - test: [], - }, FIX: { live: ['https://www.bbc.com/persian/science-52004647'], test: [ From 0925e9bf1996b44da0002659c0b9ff5cd991aa5f Mon Sep 17 00:00:00 2001 From: louisearchibald Date: Thu, 28 Nov 2024 09:24:31 +0000 Subject: [PATCH 8/8] add /serbian/lat to lighthouse tipoHomePage live urls array --- lighthouse/lighthouserc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lighthouse/lighthouserc.js b/lighthouse/lighthouserc.js index b20752b5872..4c0e309de68 100644 --- a/lighthouse/lighthouserc.js +++ b/lighthouse/lighthouserc.js @@ -53,7 +53,7 @@ const AUDIT_URLS = { }, TIPO_HOME_PAGE: { - live: ['https://www.bbc.com/kyrgyz'], + live: ['https://www.bbc.com/kyrgyz', 'https://www.bbc.com/serbian/lat'], test: [ 'https://www.test.bbc.com/kyrgyz?renderer_env=live', 'https://www.test.bbc.com/serbian/lat?renderer_env=live',