@fluentui-react-native/tester 0.103.0 → 0.103.1

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 */

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

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

package/src/E2E/TextExperimental/specs/ExperimentalText.spec.ios.ts

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import ExperimentalTextPageObject from '../pages/ExperimentalTextPageObject.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('Experimental Text Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Experimental Text Testing Initialization', function () {
   });
 
   it('Click and navigate to Experimental Text test page', async () => {
-    await ExperimentalTextPageObject.scrollToComponentButton(Platform.iOS);
+    await ExperimentalTextPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await ExperimentalTextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/TextExperimental/specs/ExperimentalText.spec.win.ts

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import ExperimentalTextPageObject from '../pages/ExperimentalTextPageObject.win';
 import { TEXT_A11Y_ROLE, 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('Experimental Text Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Experimental Text Testing Initialization', function () {
   });
 
   it('Click and navigate to Experimental Text test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await ExperimentalTextPageObject.scrollToComponentButton(Platform.Win32);
-    await ExperimentalTextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToExperimentalTextPage();
     await ExperimentalTextPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

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

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import ThemePageObject from '../pages/ThemePageObject.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('Theme Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Theme Testing Initialization', function () {
   });
 
   it('Click and navigate to Theme test page', async () => {
-    await ThemePageObject.scrollToComponentButton(Platform.iOS);
+    await ThemePageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await ThemePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import ThemePageObject from '../pages/ThemePageObject.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('Theme Testing Initialization', function () {
@@ -11,9 +10,6 @@ describe('Theme Testing Initialization', function () {
   });
 
   it('Click and navigate to Theme test page', async () => {
-    await ThemePageObject.scrollToComponentButton(Platform.Win32);
-    await ThemePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToThemePage();
     await ThemePageObject.waitForPageDisplayed(PAGE_TIMEOUT);

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

@@ -1,7 +1,7 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import TokenPageObject from '../pages/TokensPageObject.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('Tokens Testing Initialization', function () {
@@ -11,7 +11,7 @@ describe('Tokens Testing Initialization', function () {
   });
 
   it('Click and navigate to Tokens test page', async () => {
-    await TokenPageObject.scrollToComponentButton(Platform.iOS);
+    await TokenPageObject.mobileScrollToComponentButton(MobilePlatform.iOS);
     await TokenPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

@@ -1,7 +1,6 @@
 import NavigateAppPage from '../../common/NavigateAppPage';
 import TokenPageObject from '../pages/TokensPageObject.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('Tokens Testing Initialization', function () {
@@ -11,10 +10,6 @@ describe('Tokens Testing Initialization', function () {
   });
 
   it('Click and navigate to Tokens test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await TokenPageObject.scrollToComponentButton(Platform.Win32);
-    await TokenPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
-
     /* Click on component button to navigate to test page */
     await NavigateAppPage.clickAndGoToTokensPage();
     await TokenPageObject.waitForPageDisplayed(PAGE_TIMEOUT);

package/src/E2E/common/BasePage.ts

@@ -18,13 +18,19 @@ export const enum ComponentSelector {
   Secondary, // this._secondaryComponent
 }
 
-export const enum Platform {
+export const enum MobilePlatform {
+  iOS = 0,
+  Android,
+}
+
+export const enum NativePlatform {
   Win32 = 0,
-  iOS,
+  Windows,
   macOS,
-  Android,
 }
 
+export type Platform = MobilePlatform | NativePlatform;
+
 /****************************** IMPORTANT! PLEASE READ! **************************************************
  * Every component's page object extends this. We can assume each test page will interact with at least
  * two UI elements, so we'll add integration for two UI elements in this file (See *Getters* section below).
@@ -72,8 +78,9 @@ export class BasePage {
   }
 
   /* Scrolls until the desired test page's button is displayed. We use the scroll viewer UI element as the point to start scrolling.
-   * We use a negative number as the Y-coordinate because that enables us to scroll downwards */
-  async scrollToComponentButton(platform: Platform): Promise<void> {
+   * We use a negative number as the Y-coordinate because that enables us to scroll downwards.
+   * There are no need for win32 and macos cases, as the click command automatically scrolls the element into view. */
+  async mobileScrollToComponentButton(platform: MobilePlatform): Promise<void> {
     if (await (await this._pageButton).isDisplayed()) {
       return;
     }
@@ -82,23 +89,7 @@ export class BasePage {
       'Could not scroll to the ' + this._pageName + "'s Button. Please see Pipeline artifacts for more debugging information.";
 
     switch (platform) {
-      case Platform.Win32: {
-        const scrollDownKeys = [Keys.PAGE_DOWN];
-        await browser.waitUntil(
-          async () => {
-            await (await this._firstTestPageButton).addValue(scrollDownKeys);
-            scrollDownKeys.push(Keys.PAGE_DOWN);
-            return await (await this._pageButton).isDisplayed();
-          },
-          {
-            timeout: this.waitForUiEvent,
-            timeoutMsg: errorMsg,
-          },
-        );
-        break;
-      }
-
-      case Platform.iOS: {
+      case MobilePlatform.iOS: {
         await browser.waitUntil(
           async () => {
             await driver.execute('mobile: scroll', { direction: 'down' });
@@ -111,13 +102,8 @@ export class BasePage {
         );
         break;
       }
-
-      case Platform.macOS:
-        // Not needed for macOS. It automatically scrolls
-        break;
-
       default:
-      case Platform.Android:
+      case MobilePlatform.Android:
         // Todo
         break;
     }
@@ -208,21 +194,6 @@ export class BasePage {
     return windowHandles.length > 1;
   }
 
-  /* Finds the first test page button in the ScrollView */
-  async SetFirstScrollViewButtonChild() {
-    const TestChildren = await (await this._testPageButtonScrollViewer).$$('//*');
-    const reg = new RegExp('Homepage_[a-zA-Z]*_Button');
-
-    for (const child of TestChildren) {
-      const autoId = await child.getAttribute('AutomationId');
-      if (autoId && autoId !== TESTPAGE_BUTTONS_SCROLLVIEWER && autoId.match(reg)) {
-        return await child;
-      }
-    }
-
-    return null;
-  }
-
   /*****************************************/
   /**************** Getters ****************/
   /*****************************************/
@@ -269,10 +240,6 @@ export class BasePage {
     return By(TESTPAGE_BUTTONS_SCROLLVIEWER);
   }
 
-  get _firstTestPageButton() {
-    return this.SetFirstScrollViewButtonChild();
-  }
-
   /****************** Error Messages ******************/
   get ERRORMESSAGE_SUFFIX(): string {
     return 'Please review logs and error screenshots for more information.';

package/src/TestComponents/Dropdown/DropdownTest.tsx

@@ -8,9 +8,10 @@ import { Test, TestSection, PlatformStatus } from '../Test';
 const DropdownDefault: React.FunctionComponent = () => {
   return (
     <Stack style={stackStyle}>
-      <Dropdown />
-      <Option>Test</Option>
-      <Option disabled>Disabled Test</Option>
+      <Dropdown>
+        <Option>Test</Option>
+        <Option disabled>Disabled Test</Option>
+      </Dropdown>
     </Stack>
   );
 };