diff --git a/content/en/dd_e2e/cdocs/components/site_region.mdoc.md b/content/en/dd_e2e/cdocs/components/site_region.mdoc.md index 9be54eb0b0d..8bf21171812 100644 --- a/content/en/dd_e2e/cdocs/components/site_region.mdoc.md +++ b/content/en/dd_e2e/cdocs/components/site_region.mdoc.md @@ -46,3 +46,9 @@ This content is only visible in the **AP1** region. {% site-region region="gov" %} This content is only visible in the **Gov** region. {% /site-region %} + +### Multi-region (us,eu) + +{% site-region region="us,eu" %} +This content is visible in both the **US1** and **EU** regions. +{% /site-region %} diff --git a/e2e/components/site-region/cdocs-site-region.spec.ts b/e2e/components/site-region/cdocs-site-region.spec.ts index dcfd2e43277..c6e361a66e5 100644 --- a/e2e/components/site-region/cdocs-site-region.spec.ts +++ b/e2e/components/site-region/cdocs-site-region.spec.ts @@ -29,4 +29,17 @@ test.describe('Cdocs site region component', () => { await page.click('.js-region-select .btn'); await page.click('.js-region-select .dropdown-item[data-value="us"]'); }); + + test('multi-region block is visible for each matching site', async ({ page }) => { + const multiRegion = page.locator('[data-region="us,eu"]'); + await expect(multiRegion).not.toHaveClass(/d-none/); + + await page.click('.js-region-select .btn'); + await page.click('.js-region-select .dropdown-item[data-value="eu"]'); + await expect(multiRegion).not.toHaveClass(/d-none/); + + await page.click('.js-region-select .btn'); + await page.click('.js-region-select .dropdown-item[data-value="us3"]'); + await expect(multiRegion).toHaveClass(/d-none/); + }); }); diff --git a/e2e/components/site-region/cdocs-site-region.spec.ts-snapshots/site-region-eu-selected-chromium-darwin.png b/e2e/components/site-region/cdocs-site-region.spec.ts-snapshots/site-region-eu-selected-chromium-darwin.png index 1d48798edf8..5e0f5b5633e 100644 Binary files a/e2e/components/site-region/cdocs-site-region.spec.ts-snapshots/site-region-eu-selected-chromium-darwin.png and b/e2e/components/site-region/cdocs-site-region.spec.ts-snapshots/site-region-eu-selected-chromium-darwin.png differ diff --git a/e2e/components/site-region/cdocs-site-region.spec.ts-snapshots/site-region-initial-chromium-darwin.png b/e2e/components/site-region/cdocs-site-region.spec.ts-snapshots/site-region-initial-chromium-darwin.png index 4e051efd171..5949da04ad9 100644 Binary files a/e2e/components/site-region/cdocs-site-region.spec.ts-snapshots/site-region-initial-chromium-darwin.png and b/e2e/components/site-region/cdocs-site-region.spec.ts-snapshots/site-region-initial-chromium-darwin.png differ diff --git a/package.json b/package.json index 8186fab9beb..bcff415796e 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@popperjs/core": "^2.11.8", "alpinejs": "^3.13.7", "bootstrap": "^5.2", - "cdocs-hugo-integration": "https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/cdocs-hugo-integration-v4.1.0.tgz", + "cdocs-hugo-integration": "https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/cdocs-hugo-integration-v4.2.0.tgz", "del": "4.1.1", "fancy-log": "^1.3.3", "geo-locate": "https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/geo-locate-v1.0.2.tgz", diff --git a/yarn.lock b/yarn.lock index a68a461b394..8fe96be6f23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6647,9 +6647,9 @@ __metadata: languageName: node linkType: hard -"cdocs-hugo-integration@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/cdocs-hugo-integration-v4.1.0.tgz": - version: 4.1.0 - resolution: "cdocs-hugo-integration@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/cdocs-hugo-integration-v4.1.0.tgz" +"cdocs-hugo-integration@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/cdocs-hugo-integration-v4.2.0.tgz": + version: 4.2.0 + resolution: "cdocs-hugo-integration@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/cdocs-hugo-integration-v4.2.0.tgz" dependencies: "@prettier/sync": "npm:^0.5.2" "@types/markdown-it": "npm:^14.1.2" @@ -6674,7 +6674,7 @@ __metadata: vite: "npm:^5.4.10" vite-plugin-singlefile: "npm:^2.0.2" zod: "npm:^4.1.12" - checksum: 10/d2831144a700eacf7e24004ceeaa3258c292edd40c5ab9562fdbd9fbac81b6d369c6a7da5ce717566cfb173e7d365cc1d9501dfad81930ec304c78fb878fbfe1 + checksum: 10/328ddcdc2cf95ec17114c835b5b3af415e55deafd181f778d8c95ea3b27b63ad84f2f6707ce63ef986c4d4ceb4b9e48b3aa213d883086daacd5bd27550d5ed78 languageName: node linkType: hard @@ -7725,7 +7725,7 @@ __metadata: acorn: "npm:^7.4.1" alpinejs: "npm:^3.13.7" bootstrap: "npm:^5.2" - cdocs-hugo-integration: "https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/cdocs-hugo-integration-v4.1.0.tgz" + cdocs-hugo-integration: "https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/cdocs-hugo-integration-v4.2.0.tgz" cross-env: "npm:^5.2.1" del: "npm:4.1.1" eslint: "npm:^6.8.0"