@fluentui-react-native/tester 0.92.0 → 0.93.1

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

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

package/src/E2E/ButtonExperimental/pages/ButtonExperimentalPageObject.ts

@@ -5,7 +5,7 @@ import {
   HOMEPAGE_BUTTON_BUTTON,
   BUTTON_ON_PRESS,
 } from '../../../TestComponents/Button/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 /* This enum gives the spec file an EASY way to interact with SPECIFIC UI elements on the page.
  * The spec file should import this enum and use it when wanting to interact with different elements on the page. */

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

@@ -1,6 +1,6 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
 import ButtonExperimentalPageObject, { ButtonSelector } from '../pages/ButtonExperimentalPageObject';
-import { ComponentSelector } from '../../common/BasePage.win';
+import { ComponentSelector, Platform } from '../../common/BasePage';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT, BUTTON_A11Y_ROLE, Keys } from '../../common/consts';
 import { BUTTON_ACCESSIBILITY_LABEL, BUTTON_TEST_COMPONENT_LABEL } from '../../../TestComponents/Button/consts';
 
@@ -13,7 +13,7 @@ describe('Experimental Button Testing Initialization', function () {
 
   it('Click and navigate to Button test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    await ButtonExperimentalPageObject.scrollToComponentButton();
+    await ButtonExperimentalPageObject.scrollToComponentButton(Platform.Win32);
     await ButtonExperimentalPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Callout/pages/CalloutPageObject.win.ts

@@ -4,7 +4,7 @@ import {
   HOMEPAGE_CALLOUT_BUTTON,
   BUTTON_TO_OPEN_CALLOUT,
 } from '../../../TestComponents/Callout/consts';
-import { BasePage, By, COMPONENT_SCROLL_COORDINATES } from '../../common/BasePage.win';
+import { BasePage, By, COMPONENT_SCROLL_COORDINATES } from '../../common/BasePage';
 
 class CalloutPageObject extends BasePage {
   /******************************************************************/

package/src/E2E/Callout/specs/Callout.spec.macos.ts

@@ -0,0 +1,21 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import CalloutPageObject from '../pages/CalloutPageObject.win';
+import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
+
+// Before testing begins, allow up to 60 seconds for app to open
+describe('Callout 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 Callout test page', async () => {
+    await CalloutPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToCalloutPage();
+    await CalloutPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await CalloutPageObject.isPageLoaded()).toBeTruthy(CalloutPageObject.ERRORMESSAGE_PAGELOAD);
+  });
+});

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

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

package/src/E2E/Checkbox/pages/CheckboxPageObject.ts

@@ -5,7 +5,7 @@ import {
   HOMEPAGE_CHECKBOX_BUTTON,
   CHECKBOX_ON_PRESS,
 } from '../../../TestComponents/Checkbox/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 /* This enum gives the spec file an EASY way to interact with SPECIFIC UI elements on the page.
  * The spec file should import this enum and use it when wanting to interact with different elements on the page. */

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

@@ -0,0 +1,22 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import CheckboxPageObject from '../pages/CheckboxPageObject';
+import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
+import { Platform } from '../../common/BasePage';
+
+describe('Checkbox Testing Initialization', () => {
+  it('Wait for app load', async () => {
+    await NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
+    await expect(await NavigateAppPage.isPageLoaded()).toBeTruthy();
+  });
+
+  it('Click and navigate to Checkbox test page', async () => {
+    await CheckboxPageObject.scrollToComponentButton(Platform.iOS);
+    await CheckboxPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToCheckboxPage();
+    await CheckboxPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await CheckboxPageObject.isPageLoaded()).toBeTruthy();
+  });
+});

package/src/E2E/Checkbox/specs/Checkbox.spec.macos.ts

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import CheckboxPageObject from '../pages/CheckboxPageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import CheckboxPageObject from '../pages/CheckboxPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
 describe('Checkbox Testing Initialization', () => {
@@ -9,8 +9,6 @@ describe('Checkbox Testing Initialization', () => {
   });
 
   it('Click and navigate to Checkbox test page', async () => {
-    /* Scroll to component test page button in scrollview if not already visible*/
-    await CheckboxPageObject.scrollToComponentButton();
     await CheckboxPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

@@ -1,6 +1,6 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
 import CheckboxPageObject, { CheckboxSelector } from '../pages/CheckboxPageObject';
-import { ComponentSelector } from '../../common/BasePage.win';
+import { ComponentSelector, Platform } from '../../common/BasePage';
 import { CHECKBOX_TEST_COMPONENT_LABEL, CHECKBOX_ACCESSIBILITY_LABEL } from '../../../TestComponents/Checkbox/consts';
 import { CHECKBOX_A11Y_ROLE, PAGE_TIMEOUT, BOOT_APP_TIMEOUT, Keys } from '../../common/consts';
 
@@ -12,7 +12,7 @@ describe('Checkbox Testing Initialization', () => {
 
   it('Click and navigate to Checkbox test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    await CheckboxPageObject.scrollToComponentButton();
+    await CheckboxPageObject.scrollToComponentButton(Platform.Win32);
     await CheckboxPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

@@ -1,6 +1,6 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
 import CheckboxPageObject from '../pages/CheckboxPageObject';
-import { ComponentSelector } from '../../common/BasePage.win';
+import { ComponentSelector, Platform } from '../../common/BasePage';
 import { CHECKBOX_TEST_COMPONENT_LABEL, CHECKBOX_ACCESSIBILITY_LABEL } from '../../../TestComponents/Checkbox/consts';
 import { CHECKBOX_A11Y_ROLE, PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
@@ -12,7 +12,7 @@ describe('Checkbox Testing Initialization', () => {
 
   it('Click and navigate to Checkbox test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    await CheckboxPageObject.scrollToComponentButton();
+    await CheckboxPageObject.scrollToComponentButton(Platform.Win32);
     await CheckboxPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/CheckboxExperimental/pages/ExperimentalCheckboxPageObject.ts

@@ -5,7 +5,7 @@ import {
   EXPERIMENTAL_CHECKBOX_NO_A11Y_LABEL_COMPONENT,
   EXPERIMENTAL_CHECKBOX_ON_PRESS,
 } from '../../../TestComponents/CheckboxExperimental/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 /* This enum gives the spec file an EASY way to interact with SPECIFIC UI elements on the page.
  * The spec file should import this enum and use it when wanting to interact with different elements on the page. */

package/src/E2E/CheckboxExperimental/specs/ExperimentalCheckbox.spec.ios.ts

@@ -0,0 +1,22 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import ExperimentalCheckboxPageObject from '../pages/ExperimentalCheckboxPageObject';
+import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
+import { Platform } from '../../common/BasePage';
+
+describe('Experimental Checkbox Testing Initialization', () => {
+  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 Experimental Checkbox test page', async () => {
+    await ExperimentalCheckboxPageObject.scrollToComponentButton(Platform.iOS);
+    await ExperimentalCheckboxPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToCheckboxExperimentalPage();
+    await ExperimentalCheckboxPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await ExperimentalCheckboxPageObject.isPageLoaded()).toBeTruthy(ExperimentalCheckboxPageObject.ERRORMESSAGE_PAGELOAD);
+  });
+});

package/src/E2E/CheckboxExperimental/specs/ExperimentalCheckbox.spec.macos.ts

@@ -0,0 +1,20 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import ExperimentalCheckboxPageObject from '../pages/ExperimentalCheckboxPageObject';
+import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
+
+describe('Experimental Checkbox Testing Initialization', () => {
+  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 Experimental Checkbox test page', async () => {
+    await ExperimentalCheckboxPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToCheckboxExperimentalPage();
+    await ExperimentalCheckboxPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await ExperimentalCheckboxPageObject.isPageLoaded()).toBeTruthy(ExperimentalCheckboxPageObject.ERRORMESSAGE_PAGELOAD);
+  });
+});

package/src/E2E/CheckboxExperimental/specs/ExperimentalCheckbox.spec.win.ts

@@ -1,6 +1,6 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
 import ExperimentalCheckboxPageObject, { ExperimentalCheckboxSelector } from '../pages/ExperimentalCheckboxPageObject';
-import { ComponentSelector } from '../../common/BasePage.win';
+import { ComponentSelector, Platform } from '../../common/BasePage';
 import {
   EXPERIMENTAL_CHECKBOX_TEST_COMPONENT_LABEL,
   EXPERIMENTAL_CHECKBOX_ACCESSIBILITY_LABEL,
@@ -15,7 +15,7 @@ describe('Experimental Checkbox Testing Initialization', () => {
 
   it('Click and navigate to Experimental Checkbox test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    await ExperimentalCheckboxPageObject.scrollToComponentButton();
+    await ExperimentalCheckboxPageObject.scrollToComponentButton(Platform.Win32);
     await ExperimentalCheckboxPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/ContextualMenu/pages/ContextualMenuPageObject.win.ts

@@ -4,7 +4,7 @@ import {
   HOMEPAGE_CONTEXTUALMENU_BUTTON,
   CONTEXTUALMENUITEM_TEST_COMPONENT,
 } from '../../../TestComponents/ContextualMenu/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 /* This enum gives the spec file an EASY way to interact with SPECIFIC UI elements on the page.
  * The spec file should import this enum and use it when wanting to interact with different elements on the page. */

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

@@ -0,0 +1,21 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import ContextualMenuPageObjectObject from '../pages/ContextualMenuPageObject.win';
+import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
+
+// Before testing begins, allow up to 60 seconds for app to open
+describe('ContextualMenu 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 ContextualMenu test page', async () => {
+    await ContextualMenuPageObjectObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToContextualMenuPage();
+    await ContextualMenuPageObjectObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await ContextualMenuPageObjectObject.isPageLoaded()).toBeTruthy(ContextualMenuPageObjectObject.ERRORMESSAGE_PAGELOAD);
+  });
+});

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

@@ -1,6 +1,7 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+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,7 +12,7 @@ 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();
+    await ContextualMenuPageObjectObject.scrollToComponentButton(Platform.Win32);
     await ContextualMenuPageObjectObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/FocusTrapZone/pages/FocusTrapZonePageObject.win.ts

@@ -3,7 +3,7 @@ import {
   FOCUSTRAPZONE_TEST_COMPONENT,
   HOMEPAGE_FOCUSTRAPZONE_BUTTON,
 } from '../../../TestComponents/FocusTrapZone/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class FocusTrapZonePageObject extends BasePage {
   // OVERRIDE: We use isExisting() here instead of isDisplayed() because FocusTrapZone does not have any UI to it, it's simply

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

@@ -1,6 +1,7 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+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,7 +12,7 @@ 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();
+    await FocusTrapZonePageObject.scrollToComponentButton(Platform.Win32);
     await FocusTrapZonePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/FocusZone/pages/{FocusZonePageObject.win.ts → FocusZonePageObject.ts}

@@ -1,5 +1,5 @@
 import { FOCUSZONE_TESTPAGE, FOCUSZONE_TEST_COMPONENT, HOMEPAGE_FOCUSZONE_BUTTON } from '../../../TestComponents/FocusZone/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class FocusZonePageObject extends BasePage {
   // OVERRIDE: We use isExisting() here instead of isDisplayed() because FocusZone does not have any UI to it, it's simply

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import FocusZonePageObject from '../pages/FocusZonePageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import FocusZonePageObject from '../pages/FocusZonePageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
 // Before testing begins, allow up to 60 seconds for app to open
@@ -10,8 +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();
     await FocusZonePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

@@ -1,6 +1,7 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
-import FocusZonePageObject from '../pages/FocusZonePageObject.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import FocusZonePageObject from '../pages/FocusZonePageObject';
 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('FocusZone Testing Initialization', function () {
@@ -11,7 +12,7 @@ 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();
+    await FocusZonePageObject.scrollToComponentButton(Platform.Win32);
     await FocusZonePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Icon/pages/{IconPageObject.win.ts → IconPageObject.ts}

@@ -4,7 +4,7 @@ import {
   HOMEPAGE_ICON_BUTTON,
   ICON_NO_A11Y_LABEL_COMPONENT,
 } from '../../../TestComponents/Icon/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class IconPageObject extends BasePage {
   /*****************************************/

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

@@ -0,0 +1,23 @@
+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 () {
+  it('Wait for app load', async () => {
+    await NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
+    await expect(await NavigateAppPage.isPageLoaded()).toBeTruthy();
+  });
+
+  it('Click and navigate to Icon test page', async () => {
+    await IconPageObject.scrollToComponentButton(Platform.iOS);
+    await IconPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToIconPage();
+    await IconPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await IconPageObject.isPageLoaded()).toBeTruthy();
+  });
+});

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import IconPageObject from '../pages/IconPageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import IconPageObject from '../pages/IconPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
 // Before testing begins, allow up to 60 seconds for app to open
@@ -10,8 +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();
     await IconPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

@@ -1,6 +1,7 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
-import IconPageObject from '../pages/IconPageObject.win';
+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,7 +12,7 @@ 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();
+    await IconPageObject.scrollToComponentButton(Platform.Win32);
     await IconPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

@@ -4,7 +4,7 @@ import {
   HOMEPAGE_LINK_BUTTON,
   LINK_NO_A11Y_LABEL_COMPONENT,
 } from '../../../TestComponents/Link/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class LinkPageObject extends BasePage {
   /*****************************************/

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

@@ -0,0 +1,23 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import LinkPageObject from '../pages/LinkPageObject';
+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('Link Testing Initialization', function () {
+  it('Wait for app load', async () => {
+    await NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
+    await expect(await NavigateAppPage.isPageLoaded()).toBeTruthy();
+  });
+
+  it('Click and navigate to Link test page', async () => {
+    await LinkPageObject.scrollToComponentButton(Platform.iOS);
+    await LinkPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToLinkPage();
+    await LinkPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await LinkPageObject.isPageLoaded()).toBeTruthy();
+  });
+});

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import LinkPageObject from '../pages/LinkPageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import LinkPageObject from '../pages/LinkPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
 // Before testing begins, allow up to 60 seconds for app to open
@@ -10,8 +10,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();
     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.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
 import LinkPageObject from '../pages/LinkPageObject';
-import { ComponentSelector } from '../../common/BasePage.win';
+import { ComponentSelector, Platform } from '../../common/BasePage';
 import { LINK_ACCESSIBILITY_LABEL } from '../../../TestComponents/Link/consts';
 import { LINK_A11Y_ROLE, PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
@@ -13,7 +13,7 @@ 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();
+    await LinkPageObject.scrollToComponentButton(Platform.Win32);
     await LinkPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Menu/pages/MenuPageObject.ts

@@ -8,7 +8,7 @@ import {
   MENUITEM_TEST_COMPONENT,
   MENUPOPOVER_TEST_COMPONENT,
 } from '../../../TestComponents/Menu/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 /* This enum gives the spec file an EASY way to interact with SPECIFIC UI elements on the page.
  * The spec file should import this enum and use it when wanting to interact with different elements on the page. */

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

@@ -0,0 +1,21 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import MenuPageObject from '../pages/MenuPageObject';
+import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
+
+// Before testing begins, allow up to 60 seconds for app to open
+describe('Menu 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 Menu test page', async () => {
+    await MenuPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToMenuPage();
+    await MenuPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await MenuPageObject.isPageLoaded()).toBeTruthy(MenuPageObject.ERRORMESSAGE_PAGELOAD);
+  });
+});

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

@@ -1,7 +1,8 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
 import MenuPageObject, { MenuComponentSelector } from '../pages/MenuPageObject';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT, Keys, MENUITEM_A11Y_ROLE, MENU_A11Y_ROLE } from '../../common/consts';
 import { MENUITEM_ACCESSIBILITY_LABEL, MENUITEM_TEST_LABEL } from '../../../TestComponents/Menu';
+import { Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Menu Testing Initialization', function () {
@@ -12,7 +13,7 @@ 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();
+    await MenuPageObject.scrollToComponentButton(Platform.Win32);
     await MenuPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/MenuButton/pages/MenuButtonPageObject.win.ts

@@ -5,7 +5,7 @@ import {
   MENU_BUTTON_NO_A11Y_LABEL_COMPONENT,
   MENU_ITEM_1_COMPONENT,
 } from '../../../TestComponents/MenuButton/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 export const enum MenuButtonSelector {
   MenuButton = 0, // this._primarySelector

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

@@ -0,0 +1,21 @@
+import NavigateAppPage from '../../common/NavigateAppPage';
+import MenuButtonPageObject from '../pages/MenuButtonPageObject.win';
+import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
+
+// Before testing begins, allow up to 60 seconds for app to open
+describe('MenuButton 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 MenuButton test page', async () => {
+    await MenuButtonPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToMenuButtonPage();
+    await MenuButtonPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await MenuButtonPageObject.isPageLoaded()).toBeTruthy(MenuButtonPageObject.ERRORMESSAGE_PAGELOAD);
+  });
+});