Merge pull request #394 from UN-OCHA/CD-537

test: update E2E to match the upcoming change to OCHA Services

.github/workflows/docker-build-image.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - develop
       - 'cd-*'
+      - 'CD-*'
+      - 'OPS-*'
       - 'feature/**'
       - main
   release:

html/themes/custom/common_design_subtheme/_tests/OCHADropdown.test.js → html/themes/custom/common_design_subtheme/_tests/OCHAServices.test.js

@@ -1,33 +1,26 @@
 import env from './_env'
 
-describe('OCHAServicesDropdown', () => {
+describe('OCHAServices', () => {
   beforeAll(async() => {
     await page.goto(env.baseUrl);
   });
 
-  it('should expand when clicked', async() => {
-    const toggle = await page.$('#cd-ocha-dropdown-toggler');
-    await toggle.click();
-    const hidden = await page.$eval('#cd-ocha-dropdown', el => el.dataset.cdHidden);
-    await expect(hidden).toMatch('false');
-  });
-
   it('should contain up to four links in the Related Platforms section', async() => {
     const relatedPlatformsLimit = 4;
-    await page.waitForSelector('.cd-ocha-dropdown__section:first-child');
-    const relatedPlatformsLength = await page.$$eval('.cd-ocha-dropdown__section:first-child', nodeList => nodeList.length);
+    await page.waitForSelector('.cd-ocha-services__section:first-child');
+    const relatedPlatformsLength = await page.$$eval('.cd-ocha-services__section:first-child', nodeList => nodeList.length);
     await expect(relatedPlatformsLength).toBeLessThanOrEqual(relatedPlatformsLimit);
   });
 
   it('should NOT contain links with default text in the Related Platforms section', async() => {
-    const relatedPlatformsText = await page.$eval('.cd-ocha-dropdown__section:first-child .cd-ocha-dropdown__link a', (el) => el.innerHTML);
+    const relatedPlatformsText = await page.$eval('.cd-ocha-services__section:first-child :is(.cd-ocha-services__link, .cd-ocha-dropdown__link) a', (el) => el.innerHTML);
     await expect(relatedPlatformsText).not.toMatch('Customizable');
   });
 
   it('should contain eight links in the Other OCHA Services section', async() => {
     const otherOchaServicesLimit = 8;
-    await page.waitForSelector('.cd-ocha-dropdown__section:not(:first-child)');
-    const otherOchaServicesLength = await page.$$eval('.cd-ocha-dropdown__section:not(:first-child)', nodeList => nodeList.length);
+    await page.waitForSelector('.cd-ocha-services__section:not(:first-child)');
+    const otherOchaServicesLength = await page.$$eval('.cd-ocha-services__section:not(:first-child)', nodeList => nodeList.length);
     await expect(otherOchaServicesLength).toBeLessThanOrEqual(otherOchaServicesLimit);
   });
 
@@ -52,14 +45,14 @@ describe('OCHAServicesDropdown', () => {
       'https://reliefweb.int/',
       'https://vosocc.unocha.org/'
     ];
-    const otherOchaServices = await page.$$eval('.cd-ocha-dropdown__section:not(:first-child) .cd-ocha-dropdown__link a', text => { return text.map(text => text.textContent).slice(0, 8) });
-    const otherOchaServicesHref = await page.$$eval('.cd-ocha-dropdown__section:not(:first-child) .cd-ocha-dropdown__link a', anchors => { return anchors.map(anchor => anchor.href).slice(0, 8) });
+    const otherOchaServices = await page.$$eval('.cd-ocha-services__section:not(:first-child) .cd-ocha-services__link a', text => { return text.map(text => text.textContent).slice(0, 8) });
+    const otherOchaServicesHref = await page.$$eval('.cd-ocha-services__section:not(:first-child) .cd-ocha-services__link a', anchors => { return anchors.map(anchor => anchor.href).slice(0, 8) });
     await expect(otherOchaServices).toEqual(otherOchaServicesCorporate);
     await expect(otherOchaServicesHref).toEqual(otherOchaServicesCorporateHref);
   });
 
   it('should include a button to UNOCHA.org DS list', async() => {
-    const seeAllButtonHref = await page.$eval('.cd-ocha-dropdown__see-all', (el) => el.href);
+    const seeAllButtonHref = await page.$eval('.cd-ocha-services__see-all', (el) => el.href);
     const expectedUrl = 'https://www.unocha.org/ocha-digital-services';
     await expect(seeAllButtonHref).toEqual(expectedUrl);
   });

html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-footer.html.twig

@@ -5,7 +5,7 @@
   {% endblock %}
 
   {% block ocha %}
-    {% include '@common_design_subtheme/cd/cd-header/cd-ocha.html.twig' %}
+    {% include '@common_design_subtheme/cd/cd-footer/cd-ocha.html.twig' %}
   {% endblock %}
 
 {% endembed %}

html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-ocha.html.twig

@@ -0,0 +1,10 @@
+{% embed '@common_design/cd/cd-footer/cd-ocha.html.twig' %}
+
+  {% block related_platforms %}
+    <li class="cd-ocha-services__link"><a href="https://example.com">{{ 'Overridden in sub-theme'|t }}</a></li>
+    <li class="cd-ocha-services__link"><a href="https://example.com">{{ 'Custom link'|t }}</a></li>
+    <li class="cd-ocha-services__link"><a href="https://example.com">{{ 'Custom link'|t }}</a></li>
+    <li class="cd-ocha-services__link"><a href="https://example.com">{{ 'Custom link'|t }}</a></li>
+  {% endblock %}
+
+{% endembed %}