@fluentui-react-native/tester 0.102.3 → 0.103.1

package/src/E2E/ContextualMenu/specs/ContextualMenu.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import ContextualMenuPageObjectObject, { ContextualMenuSelector } from '../pages/ContextualMenuPageObject.win';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT, Keys } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('ContextualMenu Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('ContextualMenu Testing Initialization', function () {
   });
 
   it('Click and navigate to ContextualMenu test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await ContextualMenuPageObjectObject.scrollToComponentButton(Platform.Win32);
-    await ContextualMenuPageObjectObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToContextualMenuPage();
     await ContextualMenuPageObjectObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/FocusTrapZone/specs/FocusTrapZone.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import FocusTrapZonePageObject from '../pages/FocusTrapZonePageObject.win';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('FocusTrapZone Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('FocusTrapZone Testing Initialization', function () {
   });
 
   it('Click and navigate to FocusTrapZone test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await FocusTrapZonePageObject.scrollToComponentButton(Platform.Win32);
-    await FocusTrapZonePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToFocusTrapZonePage();
     await FocusTrapZonePageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/FocusZone/specs/FocusZone.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import FocusZonePageObject, { GridButtonSelector, GridFocusZoneOption } from '../pages/FocusZonePageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT, Keys } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('FocusZone Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('FocusZone Testing Initialization', function () {
   });
 
   it('Click and navigate to FocusZone test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await FocusZonePageObject.scrollToComponentButton(Platform.Win32);
-    await FocusZonePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToFocusZonePage();
     await FocusZonePageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Icon/specs/Icon.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import IconPageObject from '../pages/IconPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Icon Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Icon Testing Initialization', function () {
   });
 
   it('Click and navigate to Icon test page', async () => {
-    await IconPageObject.scrollToComponentButton(Platform.iOS);
+    await IconPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await IconPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Icon/specs/Icon.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import IconPageObject from '../pages/IconPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Icon Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Icon Testing Initialization', function () {
   });
 
   it('Click and navigate to Icon test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await IconPageObject.scrollToComponentButton(Platform.Win32);
-    await IconPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToIconPage();
     await IconPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Link/specs/Link.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import LinkPageObject from '../pages/LinkPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Link Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Link Testing Initialization', function () {
   });
 
   it('Click and navigate to Link test page', async () => {
-    await LinkPageObject.scrollToComponentButton(Platform.iOS);
+    await LinkPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await LinkPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Link/specs/Link.spec.win.ts

@@ -1,6 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import LinkPageObject from '../pages/LinkPageObject';
-import { ComponentSelector, Platform } from '../../common/BasePage';
+import { ComponentSelector } from '../../common/BasePage';
 import { LINK_ACCESSIBILITY_LABEL } from '../../../TestComponents/Link/consts';
 import { LINK_A11Y_ROLE, PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
@@ -12,10 +12,6 @@ describe('Link Testing Initialization', function () {
   });
 
   it('Click and navigate to Link test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await LinkPageObject.scrollToComponentButton(Platform.Win32);
-    await LinkPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToLinkPage();
     await LinkPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/LinkExperimental/pages/LinkPageObject.ts

@@ -0,0 +1,34 @@
+import {
+  EXPERIMENTAL_LINK_TESTPAGE,
+  EXPERIMENTAL_LINK_TEST_COMPONENT,
+  HOMEPAGE_EXPERIMENTAL_LINK_BUTTON,
+  EXPERIMENTAL_LINK_NO_A11Y_LABEL_COMPONENT,
+} from '../../../TestComponents/LinkExperimental/consts';
+import { BasePage, By } from '../../common/BasePage';
+
+class ExperimentalLinkPageObject extends BasePage {
+  /*****************************************/
+  /**************** Getters ****************/
+  /*****************************************/
+  get _testPage() {
+    return By(EXPERIMENTAL_LINK_TESTPAGE);
+  }
+
+  get _pageName() {
+    return EXPERIMENTAL_LINK_TESTPAGE;
+  }
+
+  get _primaryComponent() {
+    return By(EXPERIMENTAL_LINK_TEST_COMPONENT);
+  }
+
+  get _secondaryComponent() {
+    return By(EXPERIMENTAL_LINK_NO_A11Y_LABEL_COMPONENT);
+  }
+
+  get _pageButton() {
+    return By(HOMEPAGE_EXPERIMENTAL_LINK_BUTTON);
+  }
+}
+
+export default new ExperimentalLinkPageObject();

package/src/E2E/LinkExperimental/specs/Link.spec.win.ts

@@ -0,0 +1,45 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import ExperimentalLinkPageObject from '../pages/LinkPageObject';
+import { ComponentSelector } from '../../common/BasePage';
+import { EXPERIMENTAL_LINK_ACCESSIBILITY_LABEL } from '../../../TestComponents/LinkExperimental/consts';
+import { LINK_A11Y_ROLE, PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
+
+// Before testing begins, allow up to 60 seconds for app to open
+describe('Link Testing Initialization', function () {
+  it('Wait for app load', async () => {
+    await NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
+    await expect(await NavigateAppPage.isPageLoaded()).toBeTruthy(NavigateAppPage.ERRORMESSAGE_APPLOAD);
+  });
+
+  it('Click and navigate to Link test page', async () => {
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToLinkExperimentalPage();
+    await ExperimentalLinkPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await ExperimentalLinkPageObject.isPageLoaded()).toBeTruthy(ExperimentalLinkPageObject.ERRORMESSAGE_PAGELOAD);
+    await expect(await ExperimentalLinkPageObject.didAssertPopup()).toBeFalsy(ExperimentalLinkPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
+  });
+});
+
+describe('Link Accessibility Testing', () => {
+  it('Link - Validate accessibilityRole is correct', async () => {
+    await ExperimentalLinkPageObject.scrollToTestElement();
+    await ExperimentalLinkPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
+
+    await expect(await ExperimentalLinkPageObject.getAccessibilityRole()).toEqual(LINK_A11Y_ROLE);
+    await expect(await ExperimentalLinkPageObject.didAssertPopup()).toBeFalsy(ExperimentalLinkPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
+  });
+
+  it('Link - Set accessibilityLabel', async () => {
+    await ExperimentalLinkPageObject.scrollToTestElement();
+    await ExperimentalLinkPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
+
+    await expect(await ExperimentalLinkPageObject.getAccessibilityLabel(ComponentSelector.Primary)).toEqual(
+      EXPERIMENTAL_LINK_ACCESSIBILITY_LABEL,
+    );
+    await expect(await ExperimentalLinkPageObject.didAssertPopup()).toBeFalsy(ExperimentalLinkPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
+  });
+
+  // No need to test not setting a11y label. The content prop gets passed down to the child Text component. This equates to not setting the a11y label
+  // on a Text component which we have testing for in our Text component spec
+});

package/src/E2E/Menu/specs/Menu.spec.win.ts

@@ -2,7 +2,6 @@ import NavigateAppPage from '../../common/NavigateAppPage';
 import MenuPageObject, { MenuComponentSelector } from '../pages/MenuPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT, Keys, MENUITEM_A11Y_ROLE, ExpandCollapseState } from '../../common/consts';
 import { MENUITEM_TEST_LABEL } from '../../../TestComponents/Menu/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Menu Testing Initialization', function () {
@@ -12,10 +11,6 @@ describe('Menu Testing Initialization', function () {
   });
 
   it('Click and navigate to Menu test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await MenuPageObject.scrollToComponentButton(Platform.Win32);
-    await MenuPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToMenuPage();
     await MenuPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/MenuButton/specs/MenuButton.spec.win.ts

@@ -2,7 +2,7 @@ import NavigateAppPage from '../../common/NavigateAppPage';
 import MenuButtonPageObject, { MenuButtonSelector } from '../pages/MenuButtonPageObject.win';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT, MENUBUTTON_A11Y_ROLE, Keys } from '../../common/consts';
 import { MENU_BUTTON_ACCESSIBILITY_LABEL, MENU_BUTTON_TEST_COMPONENT_LABEL } from '../../../TestComponents/MenuButton/consts';
-import { ComponentSelector, Platform } from '../../common/BasePage';
+import { ComponentSelector } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('MenuButton Testing Initialization', function () {
@@ -12,10 +12,6 @@ describe('MenuButton Testing Initialization', function () {
   });
 
   it('Click and navigate to MenuButton test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await MenuButtonPageObject.scrollToComponentButton(Platform.Win32);
-    await MenuButtonPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToMenuButtonPage();
     await MenuButtonPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/MenuButtonExperimental/specs/ExperimentalMenuButton.spec.win.ts

@@ -5,7 +5,7 @@ import {
   EXPERIMENTAL_MENU_BUTTON_ACCESSIBILITY_LABEL,
   EXPERIMENTAL_MENU_BUTTON_TEST_COMPONENT_LABEL,
 } from '../../../TestComponents/MenuButtonExperimental/consts';
-import { ComponentSelector, Platform } from '../../common/BasePage';
+import { ComponentSelector } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Experimental MenuButton Testing Initialization', function () {
@@ -15,10 +15,6 @@ describe('Experimental MenuButton Testing Initialization', function () {
   });
 
   it('Click and navigate to Experimental MenuButton test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await ExperimentalMenuButtonPageObject.scrollToComponentButton(Platform.Win32);
-    await ExperimentalMenuButtonPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToExperimentalMenuButtonPage();
     await ExperimentalMenuButtonPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Persona/specs/Persona.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import PersonaPageObject from '../pages/PersonaPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Persona Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Persona Testing Initialization', function () {
   });
 
   it('Click and navigate to Persona test page', async () => {
-    await PersonaPageObject.scrollToComponentButton(Platform.iOS);
+    await PersonaPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await PersonaPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Persona/specs/Persona.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import PersonaPageObject from '../pages/PersonaPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Persona Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Persona Testing Initialization', function () {
   });
 
   it('Click and navigate to Persona test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await PersonaPageObject.scrollToComponentButton(Platform.Win32);
-    await PersonaPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToPersonaPage();
     await PersonaPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/PersonaCoin/specs/PersonaCoin.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import PersonaCoinPageObject from '../pages/PersonaCoinPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('PersonaCoin Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('PersonaCoin Testing Initialization', function () {
   });
 
   it('Click and navigate to PersonaCoin test page', async () => {
-    await PersonaCoinPageObject.scrollToComponentButton(Platform.iOS);
+    await PersonaCoinPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await PersonaCoinPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/PersonaCoin/specs/PersonaCoin.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import PersonaCoinPageObject from '../pages/PersonaCoinPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('PersonaCoin Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('PersonaCoin Testing Initialization', function () {
   });
 
   it('Click and navigate to PersonaCoin test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await PersonaCoinPageObject.scrollToComponentButton(Platform.Win32);
-    await PersonaCoinPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToPersonaCoinPage();
     await PersonaCoinPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Pressable/specs/Pressable.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import PressablePageObject from '../pages/PressablePageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Pressable Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Pressable Testing Initialization', function () {
   });
 
   it('Click and navigate to Pressable test page', async () => {
-    await PressablePageObject.scrollToComponentButton(Platform.iOS);
+    await PressablePageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await PressablePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Pressable/specs/Pressable.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import PressablePageObject from '../pages/PressablePageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Pressable Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Pressable Testing Initialization', function () {
   });
 
   it('Click and navigate to Pressable test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await PressablePageObject.scrollToComponentButton(Platform.Win32);
-    await PressablePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToPressablePage();
     await PressablePageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/RadioGroup/specs/RadioGroup.spec.win.ts

@@ -1,6 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import RadioGroupPageObject, { RadioButtonSelector } from '../pages/RadioGroupPageObject';
-import { ComponentSelector, Platform } from '../../common/BasePage';
+import { ComponentSelector } from '../../common/BasePage';
 import { RADIOBUTTON_A11Y_ROLE, RADIOGROUP_A11Y_ROLE, PAGE_TIMEOUT, BOOT_APP_TIMEOUT, Keys } from '../../common/consts';
 import {
   RADIOGROUP_ACCESSIBILITY_LABEL,
@@ -17,10 +17,6 @@ describe('RadioGroup/RadioButton Testing Initialization', function () {
   });
 
   it('Click and navigate to RadioGroup test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await RadioGroupPageObject.scrollToComponentButton(Platform.Win32);
-    await RadioGroupPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToRadioGroupPage();
     await RadioGroupPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Separator/specs/Separator.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import SeparatorPageObject from '../pages/SeparatorPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Separator Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Separator Testing Initialization', function () {
   });
 
   it('Click and navigate to Separator test page', async () => {
-    await SeparatorPageObject.scrollToComponentButton(Platform.iOS);
+    await SeparatorPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await SeparatorPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Separator/specs/Separator.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import SeparatorPageObject from '../pages/SeparatorPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Separator Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Separator Testing Initialization', function () {
   });
 
   it('Click and navigate to Separator test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await SeparatorPageObject.scrollToComponentButton(Platform.Win32);
-    await SeparatorPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToSeparatorPage();
     await SeparatorPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Shimmer/specs/Shimmer.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import ShimmerPageObject from '../pages/ShimmerPageObject.win';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Shimmer Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Shimmer Testing Initialization', function () {
   });
 
   it('Click and navigate to Shimmer test page', async () => {
-    await ShimmerPageObject.scrollToComponentButton(Platform.iOS);
+    await ShimmerPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await ShimmerPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Shimmer/specs/Shimmer.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import ShimmerPageObject from '../pages/ShimmerPageObject.win';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Shimmer Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Shimmer Testing Initialization', function () {
   });
 
   it('Click and navigate to Shimmer test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await ShimmerPageObject.scrollToComponentButton(Platform.Win32);
-    await ShimmerPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToShimmerPage();
     await ShimmerPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Svg/specs/Svg.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import SvgPageObject from '../pages/SvgPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Svg Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Svg Testing Initialization', function () {
   });
 
   it('Click and navigate to Svg test page', async () => {
-    await SvgPageObject.scrollToComponentButton(Platform.iOS);
+    await SvgPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await SvgPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Svg/specs/Svg.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import SvgPageObject from '../pages/SvgPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Svg Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Svg Testing Initialization', function () {
   });
 
   it('Click and navigate to Svg test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await SvgPageObject.scrollToComponentButton(Platform.Win32);
-    await SvgPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToSvgPage();
     await SvgPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Switch/specs/Switch.spec.win.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import SwitchPageObject from '../pages/SwitchPageObject';
 import { SwitchComponentSelector } from '../pages/SwitchPageObject';
-import { ComponentSelector, Platform } from '../../common/BasePage';
+import { ComponentSelector } from '../../common/BasePage';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT, BUTTON_A11Y_ROLE, Keys } from '../../common/consts';
 import { SWITCH_TEST_COMPONENT_LABEL, SWITCH_ACCESSIBILITY_LABEL } from '../../../TestComponents/Switch/consts';
 
@@ -13,10 +13,6 @@ describe('Switch Testing Initialization', function () {
   });
 
   it('Click and navigate to Switch test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await SwitchPageObject.scrollToComponentButton(Platform.Win32);
-    await SwitchPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToSwitchPage();
     await SwitchPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Tabs/specs/Tabs.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import TabsPageObject, { TabItemSelector } from '../pages/TabsPageObject';
 import { TAB_A11Y_ROLE, BOOT_APP_TIMEOUT, PAGE_TIMEOUT, TABITEM_A11Y_ROLE, Keys } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Tabs Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Tabs Testing Initialization', function () {
   });
 
   it('Click and navigate to Tabs test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await TabsPageObject.scrollToComponentButton(Platform.Win32);
-    await TabsPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToTabsPage();
     await TabsPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Tabs/specs/Tabs.spec.windows.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import TabsPageObject, { TabItemSelector } from '../pages/TabsPageObject';
 import { TAB_A11Y_ROLE, BOOT_APP_TIMEOUT, PAGE_TIMEOUT, TABITEM_A11Y_ROLE } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Tabs Testing Initialization', function () {
@@ -12,8 +11,6 @@ describe('Tabs Testing Initialization', function () {
 
   it('Click and navigate to Tabs test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    await TabsPageObject.scrollToComponentButton(Platform.Win32);
-    await TabsPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToTabsPage();

package/src/E2E/TabsExperimental/specs/TabsExperimental.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import ExperimentalTabsPageObject from '../pages/ExperimentalTabsPageObject';
 import { TAB_A11Y_ROLE, TABITEM_A11Y_ROLE, BOOT_APP_TIMEOUT, PAGE_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Experimental Tabs Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Experimental Tabs Testing Initialization', function () {
   });
 
   it('Click and navigate to Experimental Tabs test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await ExperimentalTabsPageObject.scrollToComponentButton(Platform.Win32);
-    await ExperimentalTabsPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToExperimentalTabsPage();
     await ExperimentalTabsPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/Text/specs/Text.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import TextPageObject from '../pages/TextPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
-import { Platform } from '../../common/BasePage';
+import { MobilePlatform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Text Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Text Testing Initialization', function () {
   });
 
   it('Click and navigate to Text test page', async () => {
-    await TextPageObject.scrollToComponentButton(Platform.iOS);
+    await TextPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await TextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */