dimsum-e2e-tests 3.70.0-next.48 → 3.70.0-next.50

package/ds-form-toggle/DSToggleCO.js

@@ -36,8 +36,17 @@ export default class DSToggleCO extends PageObject {
     return $$('[data-testid="ds-controlled-toggle-checkbox"]')[index];
   }
 
-  static async getToggleState(state) {
-    return $(`//div/div[contains(text(), "${state}")]`);
+  // The on/off state is exposed semantically via aria-checked on the role="switch"
+  // button. Post PUI-16323 the visible ON/OFF label is aria-hidden and purely
+  // presentational, so state must be read from aria-checked, not the label text.
+  static async getSwitch(index = 0) {
+    return $$('button[role="switch"]')[index];
+  }
+
+  // Presentational ON/OFF label (aria-hidden). Targeted via its stable slot
+  // data-testid so we can assert the visible text tracks the state.
+  static async getStateLabel(index = 0) {
+    return $$('[data-testid="ds-formtoggle-text-wrapper"]')[index];
   }
 
   static async getTooltip() {

package/ds-global-header/GlobalHeader.announcements.func.spec.js

@@ -0,0 +1,27 @@
+import GlobalHeader from './GlobalHeaderCO';
+
+if (
+  (!browser.capabilities['ice:options'].isPhone &&
+    !browser.capabilities['ice:options'].isTablet &&
+    browser.capabilities.browserName === 'chrome') ||
+  browser.capabilities.browserName === 'Chrome'
+) {
+  describe('PUI-18771 - GlobalHeader: SearchToggle result announcement -Func', () => {
+    before(async () => {
+      const errorOnGo = await GlobalHeader.withSearchToggleURL.go();
+      if (errorOnGo) throw errorOnGo;
+      await GlobalHeader.openAndPopulateSearchToggle();
+    });
+    it('01: search input should expose the accessible name guiding users to the result navigation', async () => {
+      const searchInput = await GlobalHeader.getSearchToggleInput();
+      await expect(searchInput).toHaveAttribute(
+        'aria-label',
+        'Search among the content of the page. Press Tab twice to reach the result navigation.',
+      );
+    });
+    it('02: results spinbutton should announce the total result count after typing', async () => {
+      const spinButton = await GlobalHeader.getSearchToggleSpinbutton();
+      await expect(spinButton).toHaveAttribute('aria-valuetext', '3 total results');
+    });
+  });
+}

package/ds-global-header/GlobalHeader.axe-core.func.spec.js

@@ -19,14 +19,14 @@ if (
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
     it('02: should have global header with expanded appPicker and pass axe-core scan', async () => {
       await browser.keys(Key.Tab);
       await browser.keys(Key.Enter);
 
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
     it('03: should have global header with expanded menu-list and pass axe-core scan', async () => {
       await browser.keys(Key.Escape);
@@ -34,7 +34,7 @@ if (
       await browser.keys(Key.Tab);
       await browser.keys(Key.Enter);
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
   });
 
@@ -47,12 +47,12 @@ if (
       const globalHeader = await GlobalHeaderCO.getGlobalHeader();
       await globalHeader.waitForDisplayed();
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
   });
 
   // Skipped due to defect PUI-17970
-  describe.skip('PUI-12447 - GlobalHeader: toggle search -AxeCore', () => {
+  describe('PUI-12447 - GlobalHeader: toggle search -AxeCore', () => {
     before(async () => {
       const errorOnGo = await GlobalHeaderCO.withSearchToggleURL.go();
       if (errorOnGo) throw errorOnGo;
@@ -61,19 +61,19 @@ if (
       const globalHeader = await GlobalHeaderCO.getGlobalHeader();
       await globalHeader.waitForDisplayed();
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
     it('02: should have global header with toggle-search expanded and pass axe-core scan', async () => {
       const toggleSearch = await GlobalHeaderCO.getGHToolbarItem(0);
       await toggleSearch.click();
       await type('Hola');
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
     it('03: should have global header with populated toggle-search and pass axe-core scan', async () => {
       await type('Hola');
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
   });
 
@@ -86,12 +86,12 @@ if (
       const globalHeader = await GlobalHeaderCO.getGlobalHeader();
       await globalHeader.waitForDisplayed();
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
   });
 
   // Skipped due to defect PUI-17970
-  describe.skip('PUI-18379 - GlobalHeader: with search toggle -AxeCore', () => {
+  describe('PUI-18379 - GlobalHeader: with search toggle -AxeCore', () => {
     before(async () => {
       const errorOnGo = await GlobalHeaderCO.withSearchToggleURL.go();
       if (errorOnGo) throw errorOnGo;
@@ -103,7 +103,7 @@ if (
       await expect(toggleSearch).toHaveAttribute('aria-expanded', 'false');
       await expect(toggleSearch).toHaveAttribute('aria-controls');
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
     it('02: should have global header with search toggle expanded and pass axe-core scan', async () => {
       const toggleSearch = await GlobalHeaderCO.getGHToolbarItem(0);
@@ -111,17 +111,17 @@ if (
       await expect(toggleSearch).toHaveAttribute('aria-expanded', 'true');
       await expect(toggleSearch).toHaveAttribute('aria-controls', /^ds-global-header/);
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
     it('03: should have global header with populated search toggle and pass axe-core scan', async () => {
       await type('Labor');
       const result = await axeCoreCheck();
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
   });
 
   // Skipped due to defect PUI-17970
-  describe.skip('PUI-16270 - GlobalHeader: Controled with Iframe -AxeCore', () => {
+  describe('PUI-16270 - GlobalHeader: Controled with Iframe -AxeCore', () => {
     before(async () => {
       const errorOnGo = await GlobalHeaderCO.iframeURL.go();
       if (errorOnGo) throw errorOnGo;
@@ -130,7 +130,7 @@ if (
       const globalHeader = await GlobalHeaderCO.getGlobalHeader();
       await globalHeader.waitForDisplayed();
       const result = await axeCoreCheck({ extraDisabledRules: ['landmark-one-main'] });
-      expect(result.length).toBe(0);
+      await expect(result).toHaveLength(0);
     });
   });
 }

package/ds-global-header/GlobalHeader.func.spec.js

@@ -1,7 +1,19 @@
 import { Key } from 'webdriverio';
 import GlobalHeader from './GlobalHeaderCO';
 
-if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:options'].isTablet) {
+// Asserts the search-toggle spinbutton reflects the expected selected-result state.
+const expectSelectedResult = async (valuenow, valuetext) => {
+  const spinButton = await GlobalHeader.getSearchToggleSpinbutton();
+  await expect(spinButton).toHaveAttribute('aria-valuenow', valuenow);
+  await expect(spinButton).toHaveAttribute('aria-valuetext', valuetext);
+};
+
+if (
+  (!browser.capabilities['ice:options'].isPhone &&
+    !browser.capabilities['ice:options'].isTablet &&
+    browser.capabilities.browserName === 'chrome') ||
+  browser.capabilities.browserName === 'Chrome'
+) {
   describe('PUI-10036 - GlobalHeader: title and aria attributes', () => {
     before(async () => {
       const errorOnGo = await GlobalHeader.customAttributes.go();
@@ -80,4 +92,61 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await expect(firstToolbarItem).not.toBeFocused();
     });
   });
+
+  // Tests for the fix in PUI-17974 (SearchToggle arrow navigation could not start with ArrowDown nor cycle)
+  describe('PUI-18772 - GlobalHeader: SearchToggle result navigation with ArrowDown -Func', () => {
+    before(async () => {
+      const errorOnGo = await GlobalHeader.withSearchToggleURL.go();
+      if (errorOnGo) throw errorOnGo;
+      await GlobalHeader.openAndPopulateSearchToggle();
+    });
+    it('01: should be idle (no result selected) before navigation starts', async () => {
+      await expectSelectedResult('0', '3 total results');
+    });
+    it('02: should start navigation on last result when pressing ArrowDown from idle', async () => {
+      await browser.keys(Key.ArrowDown);
+      await expectSelectedResult('3', 'result 3 of 3');
+    });
+    it('03: should move to the previous result on subsequent ArrowDown', async () => {
+      await browser.keys(Key.ArrowDown);
+      await expectSelectedResult('2', 'result 2 of 3');
+    });
+    it('04: should reach the first result on ArrowDown', async () => {
+      await browser.keys(Key.ArrowDown);
+      await expectSelectedResult('1', 'result 1 of 3');
+    });
+    it('05: should cycle from the first result back to the last on ArrowDown', async () => {
+      await browser.keys(Key.ArrowDown);
+      await expectSelectedResult('3', 'result 3 of 3');
+    });
+  });
+
+  // Tests for the fix in PUI-17974 (SearchToggle arrow navigation could not start with ArrowDown nor cycle)
+  describe('PUI-18773 - GlobalHeader: SearchToggle result navigation with ArrowUp -Func', () => {
+    // same setup as above; here the ArrowUp navigation is exercised from idle
+    before(async () => {
+      const errorOnGo = await GlobalHeader.withSearchToggleURL.go();
+      if (errorOnGo) throw errorOnGo;
+      await GlobalHeader.openAndPopulateSearchToggle();
+    });
+    it('01: should be idle (no result selected) before navigation starts', async () => {
+      await expectSelectedResult('0', '3 total results');
+    });
+    it('02: should start navigation on the first result when pressing ArrowUp from idle', async () => {
+      await browser.keys(Key.ArrowUp);
+      await expectSelectedResult('1', 'result 1 of 3');
+    });
+    it('03: should move to the next result on subsequent ArrowUp', async () => {
+      await browser.keys(Key.ArrowUp);
+      await expectSelectedResult('2', 'result 2 of 3');
+    });
+    it('04: should reach the last result on ArrowUp', async () => {
+      await browser.keys(Key.ArrowUp);
+      await expectSelectedResult('3', 'result 3 of 3');
+    });
+    it('05: should cycle from the last result back to the first on ArrowUp', async () => {
+      await browser.keys(Key.ArrowUp);
+      await expectSelectedResult('1', 'result 1 of 3');
+    });
+  });
 }

package/ds-global-header/GlobalHeaderCO.js

@@ -1,6 +1,6 @@
 /* eslint-disable import/no-relative-packages */
 import { PATH_E2E_GLOBAL_HEADER } from '../paths';
-import { PageObject, Urlbuilder } from '../helpers';
+import { PageObject, Urlbuilder, type } from '../helpers';
 
 export default class GlobalHeader extends PageObject {
   static basicURL = new Urlbuilder(PATH_E2E_GLOBAL_HEADER, 'basic');
@@ -84,6 +84,30 @@ export default class GlobalHeader extends PageObject {
     return $('button*=Skip');
   }
 
+  static async getSearchToggleInput() {
+    return $('[data-testid="ds-globalheader-searchtoggle-textinput"]');
+  }
+
+  static async getSearchToggleSpinbutton() {
+    return $('[data-testid="ds-globalheader-searchtoggle-spinbutton-text"]');
+  }
+
+  // Opens the search toggle, runs a query, and focuses the populated results spinbutton
+  // so result navigation can be exercised. Waits for results to load before returning.
+  static async openAndPopulateSearchToggle(searchText = 'Labor') {
+    const toggleSearch = await GlobalHeader.getGHToolbarItem(0);
+    await toggleSearch.click();
+    const searchInput = await GlobalHeader.getSearchToggleInput();
+    await searchInput.click();
+    await type(searchText);
+    const spinButton = await GlobalHeader.getSearchToggleSpinbutton();
+    await browser.waitUntil(async () => (await spinButton.getText()) !== 'n/a', {
+      timeout: 3000,
+      timeoutMsg: 'search results did not populate after typing',
+    });
+    await spinButton.click();
+  }
+
   // Slots
 
   static async getGHBreadcrumbChevronlotByIndex(index = 0) {

package/ds-hooks/useFocusStack/DSHook.useFocusStack.func.spec.js

@@ -0,0 +1,83 @@
+/* eslint-disable max-len */
+import { Key } from 'webdriverio';
+import useFocusStackCO from './useFocusStackCO';
+import { tabStops } from '../../helpers';
+import DSPillsV2CO from '../../ds-pills-v2/DSPillsV2CO';
+import DSButtonV3CO from '../../ds-button-v3/DSButtonV3CO';
+
+if (
+  (!browser.capabilities['ice:options'].isPhone &&
+    !browser.capabilities['ice:options'].isTablet &&
+    browser.capabilities.browserName === 'chrome') ||
+  browser.capabilities.browserName === 'Chrome'
+) {
+  describe('PUI-13147: UseFocusStack for focus return -Func', () => {
+    before(async () => {
+      const errorOnGo = await useFocusStackCO.basicURL.go();
+      if (errorOnGo) throw errorOnGo;
+    });
+
+    it('01: should Tab x4 and have D focused', async () => {
+      await tabStops(4);
+      const typographys = (await useFocusStackCO.getTypographys()).length;
+      const pillD = await DSPillsV2CO.getCloseButtonByIndex(3);
+      // stack holds the three departed elements [C, B, A] -> 1 (h3) + 3
+      await expect(typographys).toEqual(4);
+      await expect(pillD).toBeFocused();
+    });
+
+    it('02: PUI-13301 - should click non-focused C, remove it, and keep focus on D (not B)', async () => {
+      // D is focused; click C (index 2) to remove it. Focus must return to D, the pre-click element.
+      const pillC = await DSPillsV2CO.getCloseButtonByIndex(2);
+      await pillC.click();
+      // C is gone, so the remaining pills are A, B, D, E, F, G -> D is now at index 2.
+      const pillD = await DSPillsV2CO.getCloseButtonByIndex(2);
+      const typographys = (await useFocusStackCO.getTypographys()).length;
+      // removed C does not linger; the stack reads [B, A] -> 1 (h3) + 2
+      await expect(typographys).toEqual(3);
+      await expect(pillD).toBeFocused();
+    });
+
+    it('03: should Tab forward to E, remove it, and return focus to D', async () => {
+      await tabStops(1);
+      const pillE = await DSPillsV2CO.getCloseButtonByIndex(3);
+      await expect(pillE).toBeFocused();
+      // remove the focused pill with the keyboard
+      await browser.keys(Key.Return);
+      // E removed, remaining pills are A, B, D, F, G -> D is at index 2
+      const pillD = await DSPillsV2CO.getCloseButtonByIndex(2);
+      const typographys = (await useFocusStackCO.getTypographys()).length;
+      await expect(typographys).toEqual(3);
+      await expect(pillD).toBeFocused();
+    });
+
+    it('04: should delete back through the stack until focus falls back to Reset', async () => {
+      // remove D (focused) -> B, remove B -> A, remove A -> no survivor left -> fallBackRef (Reset)
+      await browser.keys(Key.Return);
+      await browser.keys(Key.Return);
+      await browser.keys(Key.Return);
+      const reset = await DSButtonV3CO.getButtonByIndex(0);
+      const typographys = (await useFocusStackCO.getTypographys()).length;
+      // stack emptied -> only the h3 remains
+      await expect(typographys).toEqual(1);
+      await expect(reset).toBeFocused();
+    });
+
+    it('05: should click Reset and restore all removable pills', async () => {
+      await browser.keys(Key.Return);
+      const closeButtons = await DSPillsV2CO.getCloseButtons();
+      const typographys = (await useFocusStackCO.getTypographys()).length;
+      await expect(closeButtons).toHaveLength(7);
+      await expect(typographys).toEqual(1);
+    });
+    it('06: should mouse-remove E with an empty stack and fall back focus to Reset', async () => {
+      const pillE = await DSPillsV2CO.getCloseButtonByIndex(4);
+      await pillE.click();
+      const reset = await DSButtonV3CO.getButtonByIndex(0);
+      await expect(reset).toBeFocused();
+      // E is hidden, so 6 removable pills remain.
+      const closeButtons = await DSPillsV2CO.getCloseButtons();
+      await expect(closeButtons).toHaveLength(6);
+    });
+  });
+}

package/ds-shuttle-v2/DSShuttleV2CO.js

@@ -42,6 +42,8 @@ export default class DSShuttleV2CO extends PageObject {
 
   static basicURL = new Urlbuilder(PATH_E2E_SHUTTLE_V2, 'basic-test');
 
+  static breadcrumbAccessibleURL = new Urlbuilder(PATH_E2E_SHUTTLE_V2, 'breadcrumb-accessible-test');
+
   static adHocRenderAfterBulkMove = new Urlbuilder(PATH_E2E_SHUTTLE_V2, 'ad-hoc-render-after-bulk-move');
 
   static ariaPropsUrl = new Urlbuilder(PATH_E2E_SHUTTLE_V2, 'aria-props-test');
@@ -192,6 +194,8 @@ export default class DSShuttleV2CO extends PageObject {
 
   static getBreadcrumbs = async () => $$(`[data-testid="ds-breadcrumb-link"]`);
 
+  static getActiveBreadcrumb = async () => $(`[data-testid="ds-breadcrumb-link"][aria-current="step"]`);
+
   static getSubtitleByItem = async (item) => item.$$(`p`)[1];
 
   static getActionButtonByItemAndIndex = async (item, index = 0) =>

package/ds-shuttle-v2/breadcrumb-a11y/DSShuttleV2.breadcrumb-a11y.func.spec.js

@@ -0,0 +1,43 @@
+import DSShuttleV2CO from '../DSShuttleV2CO';
+
+// Tests for the fix introduced in PUI-17395 (ShuttleV2 breadcrumb a11y):
+// every step renders as a focusable <button> and the active/current step exposes
+// aria-current="step". DOM-attribute assertions are browser-agnostic, so this runs Chrome-only.
+if (
+  (!browser.capabilities['ice:options'].isPhone &&
+    !browser.capabilities['ice:options'].isTablet &&
+    browser.capabilities.browserName === 'chrome') ||
+  browser.capabilities.browserName === 'Chrome'
+) {
+  describe('PUI-18762 - DSShuttleV2:: breadcrumb active step aria-current -Func', () => {
+    before(async () => {
+      const errorOnGo = await DSShuttleV2CO.breadcrumbAccessibleURL.go();
+      if (errorOnGo) throw errorOnGo;
+    });
+
+    it('01: active step exposes aria-current="step" and every step is a focusable button', async () => {
+      // Drill down two levels so the breadcrumb has multiple steps (ancestors + current)
+      const rootItem = await DSShuttleV2CO.getItemFromSourceByIndex(1);
+      await (await DSShuttleV2CO.getActionButtonByItemAndIndex(rootItem, 0)).click();
+      const subItem = await DSShuttleV2CO.getItemFromSourceByIndex(2);
+      await (await DSShuttleV2CO.getActionButtonByItemAndIndex(subItem, 0)).click();
+
+      // Gather elements/values
+      const crumbs = await DSShuttleV2CO.getBreadcrumbs();
+      const activeCrumb = await DSShuttleV2CO.getActiveBreadcrumb();
+      const activeCrumbTag = await activeCrumb.getTagName();
+      const firstCrumb = crumbs[0];
+      const firstCrumbTag = await firstCrumb.getTagName();
+
+      // Assertions
+      await expect(crumbs.length).toBeGreaterThan(1);
+      // The current/active step (last) is announced as the current step
+      await expect(activeCrumb).toBeExisting();
+      await expect(activeCrumb).toHaveAttribute('aria-current', 'step');
+      await expect(activeCrumbTag).toBe('button');
+      // Non-active ancestor steps are buttons without aria-current
+      await expect(firstCrumbTag).toBe('button');
+      await expect(firstCrumb).not.toHaveAttribute('aria-current');
+    });
+  });
+}

package/ds-shuttle-v2/items/DSShuttleV2.items.func.spec.js

@@ -74,11 +74,13 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
     it('01: should not move the item when the disabled move action button is clicked', async () => {
       const testItem = await DSShuttleV2CO.getItemWrapper(1);
       const testItemMoveBtn = await DSShuttleV2CO.getActionButtonByItemAndIndex(testItem, 1);
-      const testItemMoveBtnDisabled = await testItemMoveBtn.getAttribute('aria-disabled');
       const testItemText = await testItem.getText();
       await testItemMoveBtn.click();
       await expect(testItemText).toBe('Source 0.1');
-      await expect(testItemMoveBtnDisabled).toBe('true');
+      // PUI-17909: a natively disabled DSButton emits the native `disabled` attribute and
+      // intentionally omits aria-disabled (that is reserved for applyAriaDisabled). Assert the
+      // native disabled state instead of the now-absent aria-disabled.
+      await expect(testItemMoveBtn).toBeDisabled();
     });
     it('02: should not display the BAB when a disabled item is clicked', async () => {
       const testItem = await DSShuttleV2CO.getItemWrapper(1);