diff --git a/cypress/e2e/pages/testsForAllAMPPages.js b/cypress/e2e/pages/testsForAllAMPPages.js index 2da08dece57..9af93cdac9f 100644 --- a/cypress/e2e/pages/testsForAllAMPPages.js +++ b/cypress/e2e/pages/testsForAllAMPPages.js @@ -2,8 +2,8 @@ export default ({ service, pageType }) => { describe(`testsForAllAMPPages to run for ${service} ${pageType}`, () => { describe('Header Tests', () => { - // limit number of tests to 2 services for navigation toggling - const testMobileNav = service === 'zhongwen' || service === 'persian'; + // limit number to Zhongwen for navigation toggling + const testMobileNav = service === 'zhongwen'; if (testMobileNav) { it('should show dropdown menu and hide scrollable menu when menu button is clicked', () => { cy.viewport(320, 480); diff --git a/cypress/e2e/pages/testsForAllCanonicalPages.js b/cypress/e2e/pages/testsForAllCanonicalPages.js index 1986f0861eb..fd47ff117ea 100644 --- a/cypress/e2e/pages/testsForAllCanonicalPages.js +++ b/cypress/e2e/pages/testsForAllCanonicalPages.js @@ -21,8 +21,8 @@ export default ({ service, pageType }) => { } describe('Header Tests', () => { - // limit number of tests to 2 services for navigation toggling - const testMobileNav = service === 'zhongwen' || service === 'persian'; + // limit number to Zhongwen for navigation toggling + const testMobileNav = service === 'zhongwen'; if (testMobileNav) { it('should show dropdown menu and hide scrollable menu when menu button is clicked', () => { diff --git a/src/app/components/Navigation/config.ts b/src/app/components/Navigation/config.ts index ed657b7cfc7..c244e9994a1 100644 --- a/src/app/components/Navigation/config.ts +++ b/src/app/components/Navigation/config.ts @@ -5,20 +5,41 @@ const SERVICES_WITH_NEW_NAV: Services[] = [ 'afrique', 'amharic', 'arabic', + 'azeri', 'bengali', + 'burmese', + 'dari', 'gahuza', 'gujarati', 'hausa', 'igbo', + 'indonesia', + 'japanese', + 'korean', + 'kyrgyz', + 'magyarul', 'marathi', + 'mundo', + 'nepali', + 'pashto', + 'persian', 'pidgin', + 'polska', + 'portuguese', 'punjabi', + 'romania', + 'russian', + 'sinhala', 'somali', 'swahili', 'tamil', 'telugu', + 'thai', 'tigrinya', + 'turkce', + 'ukrainian', 'urdu', + 'vietnamese', 'yoruba', ] as const; diff --git a/src/app/components/ThemeProvider/chameleonLogos/afaanoromoo.tsx b/src/app/components/ThemeProvider/chameleonLogos/afaanoromoo.tsx index 0fd5d9ec274..63b0369a39f 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/afaanoromoo.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/afaanoromoo.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 1420, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 1420, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/afrique.tsx b/src/app/components/ThemeProvider/chameleonLogos/afrique.tsx index 92e62330de5..2b415b325f7 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/afrique.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/afrique.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 970, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 970, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/amharic.tsx b/src/app/components/ThemeProvider/chameleonLogos/amharic.tsx index 5442de28f1a..48532e38fbf 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/amharic.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/amharic.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 750, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 750, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/azeri.tsx b/src/app/components/ThemeProvider/chameleonLogos/azeri.tsx index 0e06d9f0a6c..09d61a0e1e7 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/azeri.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/azeri.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 2234, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 1410, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/bengali.tsx b/src/app/components/ThemeProvider/chameleonLogos/bengali.tsx index d828f938cc6..4b8196c67d3 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/bengali.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/bengali.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 790, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 790, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/burmese.tsx b/src/app/components/ThemeProvider/chameleonLogos/burmese.tsx index cf3ef8f46d1..b125ec60787 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/burmese.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/burmese.tsx @@ -1,14 +1,12 @@ import build from '.'; export default build({ - width: 1541, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 720, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/dari.tsx b/src/app/components/ThemeProvider/chameleonLogos/dari.tsx index 846bde8ff80..663c703c027 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/dari.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/dari.tsx @@ -1,9 +1,16 @@ import build from '.'; export default build({ - width: 1510, - height: 425, group: ( - + <> + + + + + + + + ), + viewbox: { minY: 100, minX: 105, width: 675, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/gahuza.tsx b/src/app/components/ThemeProvider/chameleonLogos/gahuza.tsx index 26e3b8be1b4..8d08c96c013 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/gahuza.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/gahuza.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 970, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 970, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/hausa.tsx b/src/app/components/ThemeProvider/chameleonLogos/hausa.tsx index 7c570903684..9d851b17b3a 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/hausa.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/hausa.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 875, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 875, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/igbo.tsx b/src/app/components/ThemeProvider/chameleonLogos/igbo.tsx index 6f2edc35640..2a8140f9eed 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/igbo.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/igbo.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 755, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 755, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/indonesia.tsx b/src/app/components/ThemeProvider/chameleonLogos/indonesia.tsx index efaea94d5e7..87731219074 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/indonesia.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/indonesia.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 1925, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 1100, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/japanese.tsx b/src/app/components/ThemeProvider/chameleonLogos/japanese.tsx index d508e399c52..b9dd9f32dd1 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/japanese.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/japanese.tsx @@ -1,17 +1,12 @@ import build from '.'; export default build({ - width: 1675, - height: 425, group: ( <> - - - @@ -19,4 +14,5 @@ export default build({ ), + viewbox: { minY: 145, minX: 690, width: 830, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/korean.tsx b/src/app/components/ThemeProvider/chameleonLogos/korean.tsx index 02dbb88ff87..be2a23bf7a7 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/korean.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/korean.tsx @@ -1,12 +1,9 @@ import build from '.'; export default build({ - width: 1637, - height: 425, group: ( <> - @@ -15,4 +12,5 @@ export default build({ ), + viewbox: { minY: 145, minX: 690, width: 815, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/kyrgyz.tsx b/src/app/components/ThemeProvider/chameleonLogos/kyrgyz.tsx index 4450e79670a..b3e1489859c 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/kyrgyz.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/kyrgyz.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 2372, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 1550, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/magyarul.tsx b/src/app/components/ThemeProvider/chameleonLogos/magyarul.tsx index bb3f2bab41c..459011bc000 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/magyarul.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/magyarul.tsx @@ -1,9 +1,21 @@ import build from '.'; export default build({ - width: 1920, - height: 425, group: ( - + <> + + + + + + + + + + + + + ), + viewbox: { minY: 145, minX: 140, width: 1095, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/marathi.tsx b/src/app/components/ThemeProvider/chameleonLogos/marathi.tsx index 53b53b57564..4e2a021b0c1 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/marathi.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/marathi.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 745, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 745, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/mundo.tsx b/src/app/components/ThemeProvider/chameleonLogos/mundo.tsx index 03a0b25441d..83ed891cbe8 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/mundo.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/mundo.tsx @@ -1,9 +1,11 @@ import build from '.'; export default build({ - width: 1738, - height: 425, group: ( - + <> + + + ), + viewbox: { minY: 95, minX: 105, width: 910, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/nepali.tsx b/src/app/components/ThemeProvider/chameleonLogos/nepali.tsx index fe9936f8c50..fa59e461c18 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/nepali.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/nepali.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 1593, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 770, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/pashto.tsx b/src/app/components/ThemeProvider/chameleonLogos/pashto.tsx index 36a12052463..6cd829ac3aa 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/pashto.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/pashto.tsx @@ -1,14 +1,12 @@ import build from '.'; export default build({ - width: 1566, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 740, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/persian.tsx b/src/app/components/ThemeProvider/chameleonLogos/persian.tsx index 8266aa73610..6217785df89 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/persian.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/persian.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 1613, - height: 425, group: ( <> - ), + viewbox: { minY: 142, minX: 690, width: 785, height: 150 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/pidgin.tsx b/src/app/components/ThemeProvider/chameleonLogos/pidgin.tsx index ec352ed1c8a..2ad1d536593 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/pidgin.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/pidgin.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 850, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 850, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/polska.tsx b/src/app/components/ThemeProvider/chameleonLogos/polska.tsx index d239da8c070..1ea87ef724b 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/polska.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/polska.tsx @@ -1,25 +1,19 @@ import build from '.'; export default build({ - width: 1756, - height: 425, group: ( - + <> - - - - - - + ), + viewbox: { minY: 145, minX: 660, width: 930, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/portuguese.tsx b/src/app/components/ThemeProvider/chameleonLogos/portuguese.tsx index 6b40ef76e77..fed4b033f7e 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/portuguese.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/portuguese.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 1695, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 870, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/punjabi.tsx b/src/app/components/ThemeProvider/chameleonLogos/punjabi.tsx index 8f1db1ed649..8568a2b36d7 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/punjabi.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/punjabi.tsx @@ -8,5 +8,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 770, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 770, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/romania.tsx b/src/app/components/ThemeProvider/chameleonLogos/romania.tsx index 45261174d4b..2bd248faf53 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/romania.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/romania.tsx @@ -1,13 +1,8 @@ import build from '.'; export default build({ - viewbox: { minX: 0, minY: 0, width: 1756, height: 40 }, group: ( - - - - - + <> @@ -20,6 +15,7 @@ export default build({ - + ), + viewbox: { minY: 0, minX: 155, width: 290, height: 40 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/russian.tsx b/src/app/components/ThemeProvider/chameleonLogos/russian.tsx index e569fe32041..140e5b46c17 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/russian.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/russian.tsx @@ -1,9 +1,11 @@ import build from '.'; export default build({ - width: 2349, - height: 425, group: ( - + <> + + + ), + viewbox: { minY: 95, minX: 105, width: 1525, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/sinhala.tsx b/src/app/components/ThemeProvider/chameleonLogos/sinhala.tsx index 12e7d38cb64..68f5131a715 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/sinhala.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/sinhala.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 1651, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 830, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/somali.tsx b/src/app/components/ThemeProvider/chameleonLogos/somali.tsx index b13f9b2080f..a07ee04143b 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/somali.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/somali.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 905, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 905, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/swahili.tsx b/src/app/components/ThemeProvider/chameleonLogos/swahili.tsx index cf5e7ce8397..2a96bd4980b 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/swahili.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/swahili.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 935, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 935, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/tamil.tsx b/src/app/components/ThemeProvider/chameleonLogos/tamil.tsx index d970bf8b609..ecdbbc2c59c 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/tamil.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/tamil.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 150, minX: 685, width: 780, height: 135 }, + viewbox: { minY: 150, minX: 690, width: 780, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/telugu.tsx b/src/app/components/ThemeProvider/chameleonLogos/telugu.tsx index 571eb9d2dfb..6022522d394 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/telugu.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/telugu.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 825, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 825, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/thai.tsx b/src/app/components/ThemeProvider/chameleonLogos/thai.tsx index 5003988cfff..a188a2fe518 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/thai.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/thai.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 1498, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 675, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/tigrinya.tsx b/src/app/components/ThemeProvider/chameleonLogos/tigrinya.tsx index 0ff27ad3fbe..41b6ff39de6 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/tigrinya.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/tigrinya.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 755, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 755, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/turkce.tsx b/src/app/components/ThemeProvider/chameleonLogos/turkce.tsx index a8a3e1dffc8..379a09b32ac 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/turkce.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/turkce.tsx @@ -1,16 +1,14 @@ import build from '.'; export default build({ - width: 1750, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 925, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/ukrainian.tsx b/src/app/components/ThemeProvider/chameleonLogos/ukrainian.tsx index 1fb7c89ca53..00266b23cea 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/ukrainian.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/ukrainian.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 1812, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 990, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/vietnamese.tsx b/src/app/components/ThemeProvider/chameleonLogos/vietnamese.tsx index f4562deb5e4..8d2b3e4c01a 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/vietnamese.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/vietnamese.tsx @@ -1,13 +1,11 @@ import build from '.'; export default build({ - width: 1922, - height: 425, group: ( <> - ), + viewbox: { minY: 145, minX: 690, width: 1100, height: 135 }, }); diff --git a/src/app/components/ThemeProvider/chameleonLogos/yoruba.tsx b/src/app/components/ThemeProvider/chameleonLogos/yoruba.tsx index 1c25138df11..3cc7c6e5bad 100644 --- a/src/app/components/ThemeProvider/chameleonLogos/yoruba.tsx +++ b/src/app/components/ThemeProvider/chameleonLogos/yoruba.tsx @@ -7,5 +7,5 @@ export default build({ ), - viewbox: { minY: 145, minX: 685, width: 957, height: 135 }, + viewbox: { minY: 145, minX: 690, width: 957, height: 135 }, }); diff --git a/src/app/lib/utilities/fetchConfig/index.test.ts b/src/app/lib/utilities/fetchConfig/index.test.ts index c3275071292..31cd6647f6d 100644 --- a/src/app/lib/utilities/fetchConfig/index.test.ts +++ b/src/app/lib/utilities/fetchConfig/index.test.ts @@ -208,7 +208,7 @@ describe('fetchConfig', () => { }, ); - it('should not set the useNewNav param for non-Arabic/Tamil services', async () => { + it('should not set the useNewNav param for script services', async () => { global.fetch = jest.fn().mockResolvedValue({ ok: true, json: async () => mockNavResponse, @@ -217,8 +217,9 @@ describe('fetchConfig', () => { const { default: fetchConfig } = await import('.'); await fetchConfig({ - service: 'indonesia', - pagePath: '/indonesia', + service: 'serbian', + variant: 'cyr', + pagePath: '/serbian/cyr', configType: 'navigation', }); diff --git a/ws-nextjs-app/cypress/e2e/testsForAllAMPPages.ts b/ws-nextjs-app/cypress/e2e/testsForAllAMPPages.ts index c4674daedd3..7e9d5e71ce4 100644 --- a/ws-nextjs-app/cypress/e2e/testsForAllAMPPages.ts +++ b/ws-nextjs-app/cypress/e2e/testsForAllAMPPages.ts @@ -8,9 +8,8 @@ export default ({ service, pageType }: ServiceParametersType) => { describe(`testsThatFollowSmokeTestConfigForAllAMPPages to run for ${service} ${pageType}`, () => { describe('Header Tests', () => { const serviceName = config[service]?.name || service; - // limit number of tests to 2 services for navigation toggling - const testMobileNav = - serviceName === 'ukchina' || serviceName === 'persian'; + // limit number to Zhongwen for navigation toggling + const testMobileNav = serviceName === 'zhongwen'; const twoTierNavServices = { local: null, // Don't test two tier nav locally as the local environment can't fetch config diff --git a/ws-nextjs-app/cypress/e2e/testsForAllCanonicalPages.ts b/ws-nextjs-app/cypress/e2e/testsForAllCanonicalPages.ts index 9d60bf2a0e0..5f2e334e7d8 100644 --- a/ws-nextjs-app/cypress/e2e/testsForAllCanonicalPages.ts +++ b/ws-nextjs-app/cypress/e2e/testsForAllCanonicalPages.ts @@ -28,9 +28,8 @@ export default ({ service, pageType }: ServiceParametersType) => { describe('Header Tests', () => { const serviceName = config[service]?.name || service; - // limit number of tests to 2 services for navigation toggling - const testMobileNav = - serviceName === 'ukchina' || serviceName === 'persian'; + // limit number to Zhongwen for navigation toggling + const testMobileNav = serviceName === 'zhongwen'; const twoTierNavServices = { local: null, // Don't test two tier nav locally as the local environment can't fetch config diff --git a/ws-nextjs-app/integration/pages/photoGalleryPage/mundo/__snapshots__/amp.test.ts.snap b/ws-nextjs-app/integration/pages/photoGalleryPage/mundo/__snapshots__/amp.test.ts.snap index 5e80e0e9bb3..1df00c4e3cf 100644 --- a/ws-nextjs-app/integration/pages/photoGalleryPage/mundo/__snapshots__/amp.test.ts.snap +++ b/ws-nextjs-app/integration/pages/photoGalleryPage/mundo/__snapshots__/amp.test.ts.snap @@ -166,7 +166,7 @@ exports[`AMP Photo Gallery Page Header I can see the branding 1`] = ` { "brandLink": "BBC News, Mundo", "svg": , } `; diff --git a/ws-nextjs-app/integration/pages/photoGalleryPage/mundo/__snapshots__/canonical.test.ts.snap b/ws-nextjs-app/integration/pages/photoGalleryPage/mundo/__snapshots__/canonical.test.ts.snap index 863ed5d7290..4d76a010cf8 100644 --- a/ws-nextjs-app/integration/pages/photoGalleryPage/mundo/__snapshots__/canonical.test.ts.snap +++ b/ws-nextjs-app/integration/pages/photoGalleryPage/mundo/__snapshots__/canonical.test.ts.snap @@ -118,7 +118,7 @@ exports[`Canonical Photo Gallery Page Header I can see the branding 1`] = ` { "brandLink": "BBC News, Mundo", "svg": , } `; diff --git a/ws-nextjs-app/integration/pages/send/mundo/__snapshots__/canonical.test.ts.snap b/ws-nextjs-app/integration/pages/send/mundo/__snapshots__/canonical.test.ts.snap index 0f9337323dd..c6ee8fd3828 100644 --- a/ws-nextjs-app/integration/pages/send/mundo/__snapshots__/canonical.test.ts.snap +++ b/ws-nextjs-app/integration/pages/send/mundo/__snapshots__/canonical.test.ts.snap @@ -73,7 +73,7 @@ exports[`Canonical Send Header I can see the branding 1`] = ` { "brandLink": "BBC News, Mundo", "svg": , } `; diff --git a/ws-nextjs-app/integration/pages/storyPage/mundo/__snapshots__/amp.test.ts.snap b/ws-nextjs-app/integration/pages/storyPage/mundo/__snapshots__/amp.test.ts.snap index 8dcbb04ba28..d3acbda2e8e 100644 --- a/ws-nextjs-app/integration/pages/storyPage/mundo/__snapshots__/amp.test.ts.snap +++ b/ws-nextjs-app/integration/pages/storyPage/mundo/__snapshots__/amp.test.ts.snap @@ -173,7 +173,7 @@ exports[`AMP Story Page Header I can see the branding 1`] = ` { "brandLink": "BBC News, Mundo", "svg": , } `; diff --git a/ws-nextjs-app/integration/pages/storyPage/mundo/__snapshots__/canonical.test.ts.snap b/ws-nextjs-app/integration/pages/storyPage/mundo/__snapshots__/canonical.test.ts.snap index 0221bd14e73..3ef61180d93 100644 --- a/ws-nextjs-app/integration/pages/storyPage/mundo/__snapshots__/canonical.test.ts.snap +++ b/ws-nextjs-app/integration/pages/storyPage/mundo/__snapshots__/canonical.test.ts.snap @@ -131,7 +131,7 @@ exports[`Canonical Story Page Header I can see the branding 1`] = ` { "brandLink": "BBC News, Mundo", "svg": , } `;