From 3be0f6ad48202c8b3448c2297df9c2294337b1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLilyL0u=E2=80=9D?= Date: Thu, 28 Nov 2024 11:48:11 +0000 Subject: [PATCH 1/8] cypress home page test --- cypress/e2e/pages/homePage/urls.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cypress/e2e/pages/homePage/urls.js b/cypress/e2e/pages/homePage/urls.js index 14866c41549..bd2104c1ad2 100644 --- a/cypress/e2e/pages/homePage/urls.js +++ b/cypress/e2e/pages/homePage/urls.js @@ -21,6 +21,18 @@ const urls = [ local: '/serbian/cyr', test: '/serbian/cyr', }, + { + service: 'uzbek', + local: '/uzbek/lat', + test: '/uzbek/lat', + live: '/uzbek/lat', + }, + { + service: 'uzbek', + local: '/uzbek/cyr', + test: '/uzbek/cyr', + live: '/uzbek/cyr', + }, ]; export default () => { From ca156f34aca2a3cbaa3b9b01292479bea3200249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLilyL0u=E2=80=9D?= Date: Thu, 28 Nov 2024 11:50:22 +0000 Subject: [PATCH 2/8] add uzbek to lighthouse audit urls for tipo home page --- lighthouse/lighthouserc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lighthouse/lighthouserc.js b/lighthouse/lighthouserc.js index 4dbb904c7a8..623216ff593 100644 --- a/lighthouse/lighthouserc.js +++ b/lighthouse/lighthouserc.js @@ -57,7 +57,7 @@ const AUDIT_URLS = { }, TIPO_HOME_PAGE: { - live: ['https://www.bbc.com/kyrgyz'], + live: ['https://www.bbc.com/kyrgyz', 'https://www.bbc.com/uzbek/lat'], test: [ 'https://www.test.bbc.com/kyrgyz?renderer_env=live', 'https://www.test.bbc.com/serbian/lat?renderer_env=live', From bf9b667fb70e6b2e2f2c46ad074666d5cfd082d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLilyL0u=E2=80=9D?= Date: Thu, 28 Nov 2024 11:52:32 +0000 Subject: [PATCH 3/8] add uzbek to migratedServices and homePageServices --- src/app/routes/utils/regex/index.test.js | 1 + src/app/routes/utils/regex/utils/index.js | 1 + 2 files 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..905e620b03a 100644 --- a/src/app/routes/utils/regex/index.test.js +++ b/src/app/routes/utils/regex/index.test.js @@ -541,6 +541,7 @@ describe('frontPage -> homePage migration', () => { 'turkce', 'ukrainian', 'urdu', + 'uzbek', 'vietnamese', 'yoruba', ]; diff --git a/src/app/routes/utils/regex/utils/index.js b/src/app/routes/utils/regex/utils/index.js index 0c6077452df..305f2b9d954 100644 --- a/src/app/routes/utils/regex/utils/index.js +++ b/src/app/routes/utils/regex/utils/index.js @@ -70,6 +70,7 @@ const homePageServices = [ 'turkce', 'ukrainian', 'urdu', + 'uzbek', 'vietnamese', 'yoruba', ]; From 7cb8f07b182a3fc55e986d0f6ed2a2baed26c9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLilyL0u=E2=80=9D?= Date: Thu, 28 Nov 2024 12:02:41 +0000 Subject: [PATCH 4/8] update 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..d0dc9e3b3ee 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|serbian|sport|ukchina|ws|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)?: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|sinhala|somali|swahili|tamil|telugu|thai|tigrinya|turkce|ukrainian|urdu|uzbek|vietnamese|yoruba):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 25d64eb858cdb2ca7eabcc117c8a0953357eda85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLilyL0u=E2=80=9D?= Date: Thu, 28 Nov 2024 13:29:19 +0000 Subject: [PATCH 5/8] remove uzbek with no variant from cypress config --- cypress/support/config/settings.js | 226 ----------------------------- 1 file changed, 226 deletions(-) diff --git a/cypress/support/config/settings.js b/cypress/support/config/settings.js index 81c8d475a8f..5961b765620 100644 --- a/cypress/support/config/settings.js +++ b/cypress/support/config/settings.js @@ -8183,233 +8183,7 @@ module.exports = () => ({ }, }, }, - uzbek: { - name: 'uzbek', - font: undefined, - isWorldService: true, - variant: 'default', - pageTypes: { - articles: { - environments: { - live: { - paths: [], - enabled: false, - }, - test: { - paths: [], - enabled: false, - }, - local: { - paths: ['/uzbek/articles/cxj3rjxm6r0o'], - enabled: false, - }, - }, - smoke: false, - }, - errorPage404: { - environments: { - live: { - paths: [], - enabled: false, - }, - test: { - paths: [], - enabled: false, - }, - local: { - paths: ['/uzbek/articles/c123456abcdo'], - enabled: true, - }, - }, - smoke: false, - }, - frontPage: { environments: undefined, smoke: false }, - liveRadio: { - environments: { - live: { - paths: ['/uzbek/bbc_uzbek_radio/liveradio'], - enabled: false, - }, - test: { - paths: ['/uzbek/bbc_uzbek_radio/liveradio?renderer_env=live'], - enabled: false, - }, - local: { - paths: ['/uzbek/bbc_uzbek_radio/liveradio'], - enabled: true, - }, - }, - smoke: false, - }, - onDemandAudio: { - environments: { - live: { - paths: [ - '/uzbek/bbc_uzbek_radio/programmes/p03414fb', // On Demand Brand - '/uzbek/bbc_uzbek_radio/w172y044spy82mn', // On Demand Episode - ], - enabled: false, - }, - test: { - paths: [ - '/uzbek/bbc_uzbek_radio/programmes/p03414fb', // On Demand Brand - '/uzbek/bbc_uzbek_radio/w172y044spy82mn', // On Demand Episode - ], - enabled: false, - }, - local: { - paths: ['/uzbek/bbc_uzbek_radio/w172x9f9qjcq3lm'], - enabled: true, - }, - }, - smoke: false, - }, - onDemandTV: { - environments: { - live: { - paths: [ - '/uzbek/bbc_uzbek_tv/tv_programmes/w13xttqv', // Brand - '/uzbek/bbc_uzbek_tv/tv/w172xtx1tpwq8tz', // Episode - ], - enabled: true, - }, - test: { - paths: [ - '/uzbek/bbc_uzbek_tv/tv_programmes/w13xttqv', // Brand - '/uzbek/bbc_uzbek_tv/tv/w172xtx1tpwq8tz', // Episode - ], - enabled: true, - }, - local: { - paths: [ - '/uzbek/bbc_uzbek_tv/tv_programmes/w13xttqv', // Brand - ], - enabled: true, - }, - }, - smoke: false, - }, - topicPage: { environments: undefined, smoke: false }, - mediaAssetPage: { - environments: { - live: { - paths: [ - '/uzbek/media-50461363', // Cyrillic CPS MAP - '/uzbek/lotin-44512908', // Latin CPS MAP - '/uzbek/lotin/2016/02/160212_latin_gravity_video', // Latin TC2 MAP - '/uzbek/institutional/2016/03/160313_audio_zokirjon_mashrabov', // Cyrillic TC2 MAP Audio clip - ], - enabled: false, - }, - test: { - paths: [ - '/uzbek/world-23053613', // CPS MAP Cyrillic - '/uzbek/23279019', // CPS MAP Latin - '/uzbek/multimedia/2016/06/160610_tc2_testmap1', // TC2 MAP Cyrillic - ], - enabled: false, - }, - local: { - paths: [ - '/uzbek/world-23053613', // CPS MAP Cyrillic - '/uzbek/23279019', // CPS MAP Latin - '/uzbek/multimedia/2016/06/160610_tc2_testmap1', // TC2 MAP Cyrillic - ], - enabled: false, - }, - }, - smoke: false, - }, - photoGalleryPage: { - environments: { - live: { - paths: ['/uzbek/central-asia-46716844'], - enabled: false, - }, - test: { - paths: ['/uzbek/sport-23098743'], - enabled: false, - }, - local: { - paths: ['/uzbek/central-asia-46716844'], - enabled: true, - }, - }, - smoke: false, - }, - storyPage: { - environments: { - live: { - paths: ['/uzbek/uzbekistan-53263098'], - enabled: false, - }, - test: { - paths: ['/uzbek/23061077'], - enabled: false, - }, - local: { - paths: ['/uzbek/uzbekistan-53263099'], - enabled: true, - }, - }, - smoke: true, - }, - mostReadPage: { - environments: { - live: { - paths: ['/uzbek/popular/read'], - enabled: false, - }, - test: { - paths: ['/uzbek/popular/read'], - enabled: false, - }, - local: { - paths: ['/uzbek/popular/read'], - enabled: false, - }, - }, - smoke: false, - }, - featureIndexPage: { - environments: { - live: { - paths: ['/uzbek/52149619'], - enabled: false, - }, - test: { - paths: ['/uzbek/sport-23053653'], - enabled: false, - }, - local: { - paths: ['/uzbek/52149619'], - enabled: true, - }, - }, - smoke: false, - }, - }, - specialFeatures: { - cookieBanner: { - environments: { - live: { - paths: [], - enabled: false, - }, - test: { - paths: [], - enabled: false, - }, - local: { - paths: [], - enabled: false, - }, - }, - smoke: false, - }, - }, - }, uzbekCyr: { name: 'uzbek', font: undefined, From a6bf113e5160873a6c805f2a88bb5fb3c3f290fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLilyL0u=E2=80=9D?= Date: Thu, 28 Nov 2024 15:49:44 +0000 Subject: [PATCH 6/8] add variantless uzbek setting back to cypress --- cypress/support/config/settings.js | 226 +++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) diff --git a/cypress/support/config/settings.js b/cypress/support/config/settings.js index 5961b765620..81c8d475a8f 100644 --- a/cypress/support/config/settings.js +++ b/cypress/support/config/settings.js @@ -8183,7 +8183,233 @@ module.exports = () => ({ }, }, }, + uzbek: { + name: 'uzbek', + font: undefined, + isWorldService: true, + variant: 'default', + pageTypes: { + articles: { + environments: { + live: { + paths: [], + enabled: false, + }, + test: { + paths: [], + enabled: false, + }, + local: { + paths: ['/uzbek/articles/cxj3rjxm6r0o'], + enabled: false, + }, + }, + smoke: false, + }, + errorPage404: { + environments: { + live: { + paths: [], + enabled: false, + }, + test: { + paths: [], + enabled: false, + }, + local: { + paths: ['/uzbek/articles/c123456abcdo'], + enabled: true, + }, + }, + smoke: false, + }, + frontPage: { environments: undefined, smoke: false }, + liveRadio: { + environments: { + live: { + paths: ['/uzbek/bbc_uzbek_radio/liveradio'], + enabled: false, + }, + test: { + paths: ['/uzbek/bbc_uzbek_radio/liveradio?renderer_env=live'], + enabled: false, + }, + local: { + paths: ['/uzbek/bbc_uzbek_radio/liveradio'], + enabled: true, + }, + }, + smoke: false, + }, + onDemandAudio: { + environments: { + live: { + paths: [ + '/uzbek/bbc_uzbek_radio/programmes/p03414fb', // On Demand Brand + '/uzbek/bbc_uzbek_radio/w172y044spy82mn', // On Demand Episode + ], + enabled: false, + }, + test: { + paths: [ + '/uzbek/bbc_uzbek_radio/programmes/p03414fb', // On Demand Brand + '/uzbek/bbc_uzbek_radio/w172y044spy82mn', // On Demand Episode + ], + enabled: false, + }, + local: { + paths: ['/uzbek/bbc_uzbek_radio/w172x9f9qjcq3lm'], + enabled: true, + }, + }, + smoke: false, + }, + onDemandTV: { + environments: { + live: { + paths: [ + '/uzbek/bbc_uzbek_tv/tv_programmes/w13xttqv', // Brand + '/uzbek/bbc_uzbek_tv/tv/w172xtx1tpwq8tz', // Episode + ], + enabled: true, + }, + test: { + paths: [ + '/uzbek/bbc_uzbek_tv/tv_programmes/w13xttqv', // Brand + '/uzbek/bbc_uzbek_tv/tv/w172xtx1tpwq8tz', // Episode + ], + enabled: true, + }, + local: { + paths: [ + '/uzbek/bbc_uzbek_tv/tv_programmes/w13xttqv', // Brand + ], + enabled: true, + }, + }, + smoke: false, + }, + topicPage: { environments: undefined, smoke: false }, + mediaAssetPage: { + environments: { + live: { + paths: [ + '/uzbek/media-50461363', // Cyrillic CPS MAP + '/uzbek/lotin-44512908', // Latin CPS MAP + '/uzbek/lotin/2016/02/160212_latin_gravity_video', // Latin TC2 MAP + '/uzbek/institutional/2016/03/160313_audio_zokirjon_mashrabov', // Cyrillic TC2 MAP Audio clip + ], + enabled: false, + }, + test: { + paths: [ + '/uzbek/world-23053613', // CPS MAP Cyrillic + '/uzbek/23279019', // CPS MAP Latin + '/uzbek/multimedia/2016/06/160610_tc2_testmap1', // TC2 MAP Cyrillic + ], + enabled: false, + }, + local: { + paths: [ + '/uzbek/world-23053613', // CPS MAP Cyrillic + '/uzbek/23279019', // CPS MAP Latin + '/uzbek/multimedia/2016/06/160610_tc2_testmap1', // TC2 MAP Cyrillic + ], + enabled: false, + }, + }, + smoke: false, + }, + photoGalleryPage: { + environments: { + live: { + paths: ['/uzbek/central-asia-46716844'], + enabled: false, + }, + test: { + paths: ['/uzbek/sport-23098743'], + enabled: false, + }, + local: { + paths: ['/uzbek/central-asia-46716844'], + enabled: true, + }, + }, + smoke: false, + }, + storyPage: { + environments: { + live: { + paths: ['/uzbek/uzbekistan-53263098'], + enabled: false, + }, + test: { + paths: ['/uzbek/23061077'], + enabled: false, + }, + local: { + paths: ['/uzbek/uzbekistan-53263099'], + enabled: true, + }, + }, + smoke: true, + }, + mostReadPage: { + environments: { + live: { + paths: ['/uzbek/popular/read'], + enabled: false, + }, + test: { + paths: ['/uzbek/popular/read'], + enabled: false, + }, + local: { + paths: ['/uzbek/popular/read'], + enabled: false, + }, + }, + smoke: false, + }, + featureIndexPage: { + environments: { + live: { + paths: ['/uzbek/52149619'], + enabled: false, + }, + test: { + paths: ['/uzbek/sport-23053653'], + enabled: false, + }, + local: { + paths: ['/uzbek/52149619'], + enabled: true, + }, + }, + smoke: false, + }, + }, + specialFeatures: { + cookieBanner: { + environments: { + live: { + paths: [], + enabled: false, + }, + test: { + paths: [], + enabled: false, + }, + local: { + paths: [], + enabled: false, + }, + }, + smoke: false, + }, + }, + }, uzbekCyr: { name: 'uzbek', font: undefined, From f701c09426b8364b9a75a5a8001c01e809393a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLilyL0u=E2=80=9D?= Date: Fri, 29 Nov 2024 11:01:20 +0000 Subject: [PATCH 7/8] test commit --- cypress/support/config/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/support/config/settings.js b/cypress/support/config/settings.js index 81c8d475a8f..e0d189c5bca 100644 --- a/cypress/support/config/settings.js +++ b/cypress/support/config/settings.js @@ -8409,7 +8409,7 @@ module.exports = () => ({ smoke: false, }, }, - }, + }, // bla bla uzbekCyr: { name: 'uzbek', font: undefined, From 17cd9cc155f035b04a15c5d4eac4787d9812cfa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLilyL0u=E2=80=9D?= Date: Fri, 29 Nov 2024 11:02:00 +0000 Subject: [PATCH 8/8] reverse test commit --- cypress/support/config/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/support/config/settings.js b/cypress/support/config/settings.js index e0d189c5bca..81c8d475a8f 100644 --- a/cypress/support/config/settings.js +++ b/cypress/support/config/settings.js @@ -8409,7 +8409,7 @@ module.exports = () => ({ smoke: false, }, }, - }, // bla bla + }, uzbekCyr: { name: 'uzbek', font: undefined,