dimsum-e2e-tests 3.49.0-rc.4 → 3.50.0-next.2

package/ds-shuttle-v2/DSShuttleV2CO.js

@@ -132,14 +132,16 @@ export default class DSShuttleV2CO extends PageObject {
 
   static getCheckboxByIndex = async (index = 0) => $$(`[data-testid="ds-checkbox"]`)[index];
 
-  static getBreadcrumbItemContByIndex = async (index = 0) => $$(`[data-testid="breadcrumb-item-content"]`)[index];
-
   static getBreadcrumbByIndex = async (index = 0) => $$(`[data-testid="breadcrumb-item-container"]`)[index];
 
   static getBreadcrumbs = async () => $$(`[data-testid="breadcrumb-item-container"]`);
 
+  static getFocuseableByBreadcrumb = async (breadcrumb) => breadcrumb.$(`[data-testid="ds-typography-element"]`);
+
   static getSubtitleByItem = async (item) => item.$$(`p`)[1];
 
+  static getTypographyByItem = async (item) => item.$(`[data-testid="ds-typography-element"]`);
+
   static getActionButtonByItemAndIndex = async (item, index = 0) =>
     item.$$(`[data-testid=${DSShuttleV2DataTestIds.ITEM_ACTION_BTN}]`)[index];
 

package/ds-shuttle-v2/basic/DSShuttleV2.keyboard.func.spec.js

@@ -9,29 +9,35 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       const errorOnGo = await DSShuttleV2CO.filterURL.go();
       if (errorOnGo) throw errorOnGo;
     });
-    it('01: should tab and focus the filter icon (skiping text title)', async () => {
+    it('01: should tab and focus the breadcrumb', async () => {
+      await browser.keys(Key.Tab);
+      const breadCrumb = await DSShuttleV2CO.getBreadcrumbByIndex(0);
+      const breadcrumbFocuseable = await DSShuttleV2CO.getFocuseableByBreadcrumb(breadCrumb);
+      await expect(breadcrumbFocuseable).toBeFocused();
+    });
+    it('02: should tab and focus the filter icon', async () => {
       await browser.keys(Key.Tab);
       const sourceFilterBtn = await DSShuttleV2CO.getHeaderSearchIcon(0);
       await expect(sourceFilterBtn).toBeFocused();
     });
-    it('02: should tab and focus the select/deselect all checkbox', async () => {
+    it('03: should tab and focus the select/deselect all checkbox', async () => {
       await browser.keys(Key.Tab);
       const sourcePanelCheckbox = await DSShuttleV2CO.getCheckboxByIndex(0);
       await expect(sourcePanelCheckbox).toBeFocused();
     });
-    it('03: should tab and focus the source panel', async () => {
+    it('04: should tab and focus the source panel', async () => {
       await browser.keys(Key.Tab);
       const sourcePanel = await DSShuttleV2CO.getListWrapperMid(0);
       await expect(sourcePanel).toBeFocused();
     });
-    it('04: should select first item with arrowKeys', async () => {
+    it('05: should select first item with arrowKeys', async () => {
       await browser.keys(Key.ArrowDown);
       const firstItem = await DSShuttleV2CO.getItemCheckboxByItem(await DSShuttleV2CO.getItemFromSourceByIndex(0));
       const isFirstItemFocused = await firstItem.getAttribute('tabindex');
       await expect(isFirstItemFocused).toEqual('0'); // 0 = true for pseudofocus
       await expect(firstItem).toBeFocused();
     });
-    it('05: should Shift+Tab to focus the panel again and select last item with arrowKeys', async () => {
+    it('06: should Shift+Tab to focus the panel again and select last item with arrowKeys', async () => {
       await browser.keys([Key.Shift, Key.Tab]);
       await browser.keys(Key.ArrowUp);
       const firstItem = await DSShuttleV2CO.getItemCheckboxByIndex(9);
@@ -39,56 +45,64 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await expect(isFirstItemFocused).toEqual('0'); // 0 = true for pseudofocus
       await expect(firstItem).toBeFocused();
     });
-    it('06: should tab and focus next header search icon from destination panel', async () => {
+    it('07: should tab and focus the breadcrumb from destination panel', async () => {
       await browser.keys(Key.Tab);
-      const sourceFilterBtn = await DSShuttleV2CO.getHeaderSearchIcon(1);
-      await expect(sourceFilterBtn).toBeFocused();
+      const breadCrumb = await DSShuttleV2CO.getBreadcrumbByIndex(1);
+      const breadcrumbFocuseable = await DSShuttleV2CO.getFocuseableByBreadcrumb(breadCrumb);
+      await expect(breadcrumbFocuseable).toBeFocused();
     });
   });
-  if (browser.capabilities.browserName !== 'Firefox') {
-    describe('PUI-9799 - Shuttle V2, TabStops with BAB and LoadMore -Func.', () => {
-      before(async () => {
-        const errorOnGo = await DSShuttleV2CO.loadMoreURL.go();
-        if (errorOnGo) throw errorOnGo;
-      });
-      it('01: display the BAB and return focus to the global checkbox to follow normal flow', async () => {
-        const testItem = await DSShuttleV2CO.getItemWrapper(2);
-        await testItem.click();
-        const BAB = await DSShuttleV2CO.getMoveMultipleButton();
-        const sourcePanelCheckbox = await DSShuttleV2CO.getCheckboxByIndex(0);
-        await browser.keys([Key.Shift, Key.Tab]);
-        await browser.keys([Key.Shift, Key.Tab]);
-        await expect(BAB).toBeDisplayed();
-        await expect(sourcePanelCheckbox).toBeFocused();
-      });
-      it('03: should tab and focus the source panel', async () => {
-        await browser.keys(Key.Tab);
-        const sourcePanel = await DSShuttleV2CO.getListWrapperMid(0);
-        await expect(sourcePanel).toBeFocused();
-      });
-      it('04: should tab and focus the BAB', async () => {
-        await browser.keys(Key.Tab);
-        const BAB = await DSShuttleV2CO.getMoveMultipleButton(0);
-        await expect(BAB).toBeFocused();
-      });
-      it('05: should tab and focus the loadmore', async () => {
-        await browser.keys(Key.Tab);
-        const loadMore = await DSShuttleV2CO.getListBottomLoadMoreBtn(0);
-        await expect(loadMore).toBeFocused();
-      });
-      it('06: should tab and focus the global checkbox from destination panel', async () => {
-        await browser.keys(Key.Tab);
-        const destinationPanelCheckbox = await DSShuttleV2CO.getCheckboxByIndex(1);
-        await expect(destinationPanelCheckbox).toBeFocused();
-      });
-    });
-  }
+
+  describe('PUI-9799 - Shuttle V2, TabStops with BAB and LoadMore -Func.', () => {
+    before(async () => {
+      const errorOnGo = await DSShuttleV2CO.loadMoreURL.go();
+      if (errorOnGo) throw errorOnGo;
+    });
+    it('01: display the BAB and return focus to the breadcrumb to follow normal flow', async () => {
+      const testItem = await DSShuttleV2CO.getItemWrapper(2);
+      await testItem.click();
+      const breadCrumb = await DSShuttleV2CO.getBreadcrumbByIndex(0);
+      await breadCrumb.click();
+      const breadcrumbFocuseable = await DSShuttleV2CO.getFocuseableByBreadcrumb(breadCrumb);
+      const BAB = await DSShuttleV2CO.getMoveMultipleButton();
+      await expect(BAB).toBeDisplayed();
+      await expect(breadcrumbFocuseable).toBeFocused();
+    });
+    it('02: should tab and focus the select/deselect all checkbox', async () => {
+      await browser.keys(Key.Tab);
+      const sourcePanelCheckbox = await DSShuttleV2CO.getCheckboxByIndex(0);
+      await expect(sourcePanelCheckbox).toBeFocused();
+    });
+    it('03: should tab and focus the source panel', async () => {
+      await browser.keys(Key.Tab);
+      const sourcePanel = await DSShuttleV2CO.getListWrapperMid(0);
+      await expect(sourcePanel).toBeFocused();
+    });
+    it('04: should tab and focus the BAB', async () => {
+      await browser.keys(Key.Tab);
+      const BAB = await DSShuttleV2CO.getMoveMultipleButton(0);
+      await expect(BAB).toBeFocused();
+    });
+    it('05: should tab and focus the loadmore', async () => {
+      await browser.keys(Key.Tab);
+      const loadMore = await DSShuttleV2CO.getListBottomLoadMoreBtn(0);
+      await expect(loadMore).toBeFocused();
+    });
+    it('06: should tab and focus the breadcrumb from destination panel', async () => {
+      await browser.keys(Key.Tab);
+      const breadCrumb = await DSShuttleV2CO.getBreadcrumbByIndex(1);
+      const breadcrumbFocuseable = await DSShuttleV2CO.getFocuseableByBreadcrumb(breadCrumb);
+      await expect(breadcrumbFocuseable).toBeFocused();
+    });
+  });
+
   describe('PUI-9815 - Shuttle V2, Range selection -Func.', () => {
     before(async () => {
       const errorOnGo = await DSShuttleV2CO.basicURL.go();
       if (errorOnGo) throw errorOnGo;
     });
     it('01: should select four items pressing space only two times (using shift for range select)', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);
@@ -139,6 +153,8 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
+      await browser.keys(Key.Tab);
+      await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);
       await browser.keys(Key.Space);
       const bab = await DSShuttleV2CO.getMoveMultipleButton();
@@ -159,6 +175,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await expect(testItem2OnSource).toBe('Destination 0.3');
     });
     it('03: should bulk move items from source to destination', async () => {
+      await browser.keys([Key.Shift, Key.Tab]);
       await browser.keys([Key.Shift, Key.Tab]);
       await browser.keys([Key.Shift, Key.Tab]);
       await browser.keys(Key.ArrowDown);
@@ -184,6 +201,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
     });
     it('01: should DND first item to fourth position (source)', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);
@@ -206,6 +224,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
     });
     it('01: should display tooltip on hover of a truncated item', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);
@@ -223,6 +242,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
     });
     it('01: should display focus BAB after selecting an item and arrow right', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);

package/ds-shuttle-v2/drillingdown/DSShuttleV2.drilldown.kb.func.spec.js

@@ -1,4 +1,3 @@
-/* eslint-disable max-len */
 /* eslint-disable no-unused-vars */
 /* eslint-disable max-statements */
 import { Key } from 'webdriverio';
@@ -11,6 +10,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
     });
     it('01: should focus item', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);
@@ -53,6 +53,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
     });
     it('01: should add breadcrumbs with the items name while drilling down', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);
@@ -93,8 +94,9 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await browser.keys([Key.Shift, Key.Tab]);
       await browser.keys([Key.Shift, Key.Tab]);
       await browser.keys([Key.Shift, Key.Tab]);
+      await browser.keys([Key.Shift, Key.Tab]);
       await browser.keys(Key.Enter);
-      const breadcrumbItem2 = await DSShuttleV2CO.getBreadcrumbItemContByIndex(1);
+      const breadcrumbItem2 = await DSShuttleV2CO.getFocuseableByBreadcrumb(await DSShuttleV2CO.getBreadcrumbByIndex(1));
       const breadcrumbs = (await DSShuttleV2CO.getBreadcrumbs()).length;
       await expect(breadcrumbItem2).toBeFocused();
       await expect(breadcrumbs).toEqual(3);
@@ -102,7 +104,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
     it('02: should focus first breadcrumb item after going up from second level with KB', async () => {
       await browser.keys([Key.Shift, Key.Tab]);
       await browser.keys(Key.Enter);
-      const breadcrumbItem1 = await DSShuttleV2CO.getBreadcrumbItemContByIndex(0);
+      const breadcrumbItem1 = await DSShuttleV2CO.getFocuseableByBreadcrumb(await DSShuttleV2CO.getBreadcrumbByIndex(0));
       const breadcrumbs = (await DSShuttleV2CO.getBreadcrumbs()).length;
       await expect(breadcrumbItem1).toBeFocused();
       await expect(breadcrumbs).toEqual(2);

package/ds-shuttle-v2/filtering/DSShuttleV2.filter.kb.func.spec.js

@@ -12,6 +12,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await expect($('[data-testid="ds-shuttle-v2-area-search-bar"]')).not.toBeDisplayed();
     });
     it('02: should filter and find only one match at source panel', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Enter);
       await browser.keys(Key.Tab);
@@ -26,6 +27,11 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       const testItem = await DSShuttleV2CO.getItemWrapper(0);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
+      await browser.keys(Key.ArrowDown);
+      await browser.keys(Key.ArrowRight);
+      await browser.keys(Key.ArrowRight);
+      await browser.keys(Key.Enter);
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Enter);
       await browser.keys(Key.Tab);
@@ -34,7 +40,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await expect(destinationItems).toBe(10);
     });
     it('04: should filter and find only one match at destination panel', async () => {
-      await type('0.3');
+      await type(' 0.3');
       const destinationItems = (await DSShuttleV2CO.getItemsFromDestination()).length;
       await expect(destinationItems).toBe(1);
       const testItem = await (await DSShuttleV2CO.getItemFromDestinationByIndex(0)).getText();

package/ds-shuttle-v2/globalcheckbox/DSShuttleV2.globalcheckbox.kb.func.spec.js

@@ -18,6 +18,8 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
+      await browser.keys(Key.Tab);
+      await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);
       await browser.keys(Key.Space);
       const isChecked = await selectAllCheckbox.getAttribute('aria-checked');

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

@@ -8,6 +8,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
     });
     it('01: should move an item to destination and display its ghost on that position', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowDown);
@@ -25,6 +26,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await expect(destinationItems).toBe(11);
     });
     it('02: should return the item to its previous position', async () => {
+      await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.Tab);
       await browser.keys(Key.ArrowUp);

package/ds-toggle/DSToggle.func.spec.js

@@ -10,12 +10,12 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
       await (await DSToggleCO.getToggle()).waitForExist();
     });
-    it('01: should change state to ON', async () => {
+    it('should change state to ON', async () => {
       await (await DSToggleCO.getToggle()).click();
       const toggleState = await DSToggleCO.getToggleState('ON');
       await expect(toggleState).toBeDisplayed();
     });
-    it('02: should change state to OFF', async () => {
+    it('should change state to OFF', async () => {
       await (await DSToggleCO.getToggle()).click();
       const toggleState = await DSToggleCO.getToggleState('OFF');
       await expect(toggleState).toBeDisplayed();
@@ -27,54 +27,51 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
       await (await DSToggleCO.getToggle()).waitForExist();
     });
-    it('01: toggle should be focused', async () => {
+    it('toggle should be focused', async () => {
       await browser.keys(Key.Tab);
       const toggleComponent = await DSToggleCO.getToggleFocuseableByDataTestId('my-toggle');
       await expect(toggleComponent).toBeFocused();
     });
-    it('02: should change state to ON (Enter)', async () => {
+    it('should change state to ON (Enter)', async () => {
       await browser.keys(Key.Enter);
       const toggleState = await DSToggleCO.getToggleState('ON');
       await expect(toggleState).toBeDisplayed();
     });
-    it('03: should change state to OFF (Space)', async () => {
+    it('should change state to OFF (Space)', async () => {
       await browser.keys(Key.Space);
       const toggleState = await DSToggleCO.getToggleState('OFF');
       await expect(toggleState).toBeDisplayed();
     });
-    it('04: should change state to ON (Space)', async () => {
+    it('should change state to ON (Space)', async () => {
       await browser.keys(Key.Space);
       const toggleState = await DSToggleCO.getToggleState('ON');
       await expect(toggleState).toBeDisplayed();
     });
   });
-
   describe('PUI-6761 - DSControlledToggle:: disabled state', () => {
     before('loading page', async () => {
       const errorOnGo = await DSToggleCO.disabled.go();
       if (errorOnGo) throw errorOnGo;
       await (await DSToggleCO.getToggle()).waitForExist();
     });
-    it('01: should not change state in disabled toggle', async () => {
-      const disabledToggle = await DSToggleCO.getToggleByIndex(0);
-      await disabledToggle.click();
-      const toggleState = await disabledToggle.getText();
-      await expect(toggleState).toEqual('ON');
+    it('should not change state in disabled toggle', async () => {
+      await (await DSToggleCO.getToggle()).click();
+      const toggleState = await DSToggleCO.getToggleState('OFF');
+      await expect(toggleState).toBeDisplayed();
     });
   });
-
   describe('PUI-6762 - DSControlledToggle:: read only state', () => {
     before('loading page', async () => {
       const errorOnGo = await DSToggleCO.readOnly.go();
       if (errorOnGo) throw errorOnGo;
       await (await DSToggleCO.getToggle()).waitForExist();
     });
-    it('01: should display tooltip in read only toggle (mouse over)', async () => {
+    it('should display tooltip in read only toggle (mouse over)', async () => {
       await mouseOver(await DSToggleCO.getToggle(), 30, 10);
       const tooltip = await DSToggleCO.getTooltip();
       await expect(tooltip).toBeDisplayed();
     });
-    it('02: should display tooltip in read only toggle (keyboard focus)', async () => {
+    it('should display tooltip in read only toggle (keyboard focus)', async () => {
       await mouseOver(await DSToggleCO.getToggle(), 300, 100);
       await browser.keys(Key.Tab);
       const toggleComponent = await DSToggleCO.getToggleFocuseable();
@@ -82,17 +79,17 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await expect(toggleComponent).toBeFocused();
       await expect(tooltip).toBeDisplayed();
     });
-    it('03: should not change state on [Enter] key press', async () => {
+    it('should not change state on [Enter] key press', async () => {
       await browser.keys(Key.Enter);
       const toggleState = await DSToggleCO.getToggleState('OFF');
       await expect(toggleState).toBeDisplayed();
     });
-    it('04: should not change state on [Space] key press', async () => {
+    it('should not change state on [Space] key press', async () => {
       await browser.keys(Key.Space);
       const toggleState = await DSToggleCO.getToggleState('OFF');
       await expect(toggleState).toBeDisplayed();
     });
-    it('05: should not change state on click', async () => {
+    it('should not change state on click', async () => {
       await (await DSToggleCO.getToggle()).click();
       const toggleState = await DSToggleCO.getToggleState('OFF');
       await expect(toggleState).toBeDisplayed();
@@ -104,17 +101,17 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       if (errorOnGo) throw errorOnGo;
       await (await DSToggleCO.getToggle()).waitForExist();
     });
-    it('01: should tab through the basic toggles to the last basic toggle', async () => {
+    it('should tab through the basic toggles to the last basic toggle', async () => {
       await tabStops(6);
       const toggle = await DSToggleCO.getToggleFocuseableByIndex(4);
       await expect(toggle).toBeFocused();
     });
-    it('02: should tab and skip all three disabled toggles to the first enabled toggle, next row', async () => {
+    it('should tab and skip all three disabled toggles to the first enabled toggle, next row', async () => {
       await browser.keys(Key.Tab);
       const toggle = await DSToggleCO.getToggleFocuseableByIndex(11);
       await expect(toggle).toBeFocused();
     });
-    it('03: should tab through the readonly toggles to the last readonly toggle', async () => {
+    it('should tab through the readonly toggles to the last readonly toggle', async () => {
       await tabStops(5);
       const toggle = await DSToggleCO.getToggleFocuseableByIndex(16);
       await expect(toggle).toBeFocused();

package/ds-toggle/DSToggle.visual.spec.js

@@ -7,24 +7,23 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       const errorOnGo = await DSToggleCO.showOffURL.go();
       if (errorOnGo) throw errorOnGo;
     });
-    it('01: should display all DSControlledToggle styles correctly', async () => {
+    it('should display all DSControlledToggle styles correctly', async () => {
       await (await DSToggleCO.getToggleByIndex(0)).waitForExist();
       const snapshot = await browser.checkSnapshot(DSToggleCO.snapshotPath('show-off'));
       await expect(snapshot).toEqual(0);
     });
   });
-
   describe('PUI-6758 - DSControlledToggle - Visual Test - Label', () => {
     before('loading page', async () => {
       const errorOnGo = await DSToggleCO.labelOnOff.go();
       if (errorOnGo) throw errorOnGo;
     });
-    it('01: should display the label there correctly', async () => {
+    it('should display the label there correctly', async () => {
       await (await DSToggleCO.getToggle()).waitForExist();
       const snapshot = await browser.checkSnapshot(DSToggleCO.snapshotPath('label-there'));
       await expect(snapshot).toEqual(0);
     });
-    it('02: should display the label hello correctly', async () => {
+    it('should display the label hello correctly', async () => {
       await (await DSToggleCO.getToggle()).click();
       const snapshot = await browser.checkSnapshot(DSToggleCO.snapshotPath('label-hello'));
       await expect(snapshot).toEqual(0);
@@ -35,7 +34,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       const errorOnGo = await DSToggleCO.behindModalSlideTest.go();
       if (errorOnGo) throw errorOnGo;
     });
-    it('01: should display the modal slide (50% width) above the toggle there correctly', async () => {
+    it('should display the modal slide (50% width) above the toggle there correctly', async () => {
       const toggleModalSlide = await DSToggleCO.getToggleModalSlide();
       await toggleModalSlide.click();
       // eslint-disable-next-line wdio/no-pause
@@ -43,7 +42,7 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       const snapshot = await browser.checkSnapshot(DSToggleCO.snapshotPath('toggle-modalslide-half'));
       await expect(snapshot).toEqual(0);
     });
-    it('02: should display the modal slide (full width) above the toggle correctly', async () => {
+    it('should display the modal slide (full width) above the toggle correctly', async () => {
       const enableFullWidth = await DSToggleCO.getToggleFullWidth();
       await enableFullWidth.click();
       const toggleModalSlide = await DSToggleCO.getToggleModalSlide();
@@ -54,47 +53,24 @@ if (!browser.capabilities['ice:options'].isPhone && !browser.capabilities['ice:o
       await expect(snapshot).toEqual(0);
     });
   });
-
   describe('PUI-14393 - [Toggle] applyAriaDisabled prop - visual Test', () => {
     before('loading page', async () => {
       const errorOnGo = await DSToggleCO.applyAriaDisabled.go();
       if (errorOnGo) throw errorOnGo;
     });
-    it('01: should display aria-disabled toggle not interacted', async () => {
-      await browser.eyesOpen();
-      const snapshot = await browser.eyesCheckSnapshot(DSToggleCO.snapshotPath('toggle-aria-disabled-default'));
-      await expect(snapshot).toEqual(0);
-    });
-    it('02: The fifth aria-disabled toggle should be focused w/ kb', async () => {
-      await browser.eyesOpen();
-      await browser.keys(Key.Tab);
-      await browser.keys(Key.Tab);
-      await browser.keys(Key.Tab);
-      const snapshot = await browser.eyesCheckSnapshot(DSToggleCO.snapshotPath('toggle-aria-disabled-kb-nav'));
-      await expect(snapshot).toEqual(0);
-    });
-    it('03: should display aria-disabled toggle not interacted', async () => {
+    it('01: the first aria-disabled toggle should be focused', async () => {
       await browser.eyesOpen();
-      await browser.keys(Key.Tab);
-      const disabledToggle = await DSToggleCO.getToggleByIndex(2);
-      await disabledToggle.click();
+      const firstToggle = await DSToggleCO.getToggleByIndex(0);
+      await firstToggle.click();
       const snapshot = await browser.eyesCheckSnapshot(DSToggleCO.snapshotPath('toggle-aria-disabled-mouse'));
       await expect(snapshot).toEqual(0);
     });
-  });
-
-  describe('PUI-14882 - DSControlledToggle:: Disabled -Visual', () => {
-    before('loading page', async () => {
-      const errorOnGo = await DSToggleCO.disabled.go();
-      if (errorOnGo) throw errorOnGo;
-      await (await DSToggleCO.getToggle()).waitForExist();
-    });
-    it('01: should display in disabled state toggle not focused', async () => {
+    it('02: The fifth aria-disabled toggle should be focused', async () => {
       await browser.eyesOpen();
+      const fourthToggle = await DSToggleCO.getToggleByIndex(3);
+      await fourthToggle.click();
       await browser.keys(Key.Tab);
-      const disabledToggle = await DSToggleCO.getToggleByIndex(0);
-      await disabledToggle.click();
-      const snapshot = await browser.eyesCheckSnapshot(DSToggleCO.snapshotPath('toggle-disabled-notfocus'));
+      const snapshot = await browser.eyesCheckSnapshot(DSToggleCO.snapshotPath('toggle-aria-disabled-kb-nav'));
       await expect(snapshot).toEqual(0);
     });
   });