@fluentui-react-native/tester 0.92.1 → 0.93.2

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

@@ -1,8 +1,8 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+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 } from '../../common/BasePage.win';
+import { ComponentSelector, Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('MenuButton Testing Initialization', function () {
@@ -13,7 +13,7 @@ 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();
+    await MenuButtonPageObject.scrollToComponentButton(Platform.Win32);
     await MenuButtonPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/MenuButtonExperimental/pages/ExperimentalMenuButtonPageObject.win.ts

@@ -4,7 +4,7 @@ import {
   HOMEPAGE_EXPERIMENTAL_MENU_BUTTON,
   EXPERIMENTAL_MENU_BUTTON_NO_A11Y_LABEL_COMPONENT,
 } from '../../../TestComponents/MenuButtonExperimental/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class ExperimentalMenuButtonPageObject extends BasePage {
   /*****************************************/

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

@@ -1,11 +1,11 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
 import ExperimentalMenuButtonPageObject from '../pages/ExperimentalMenuButtonPageObject.win';
 import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT, MENUBUTTON_A11Y_ROLE } from '../../common/consts';
 import {
   EXPERIMENTAL_MENU_BUTTON_ACCESSIBILITY_LABEL,
   EXPERIMENTAL_MENU_BUTTON_TEST_COMPONENT_LABEL,
 } from '../../../TestComponents/MenuButtonExperimental/consts';
-import { ComponentSelector } from '../../common/BasePage.win';
+import { ComponentSelector, Platform } from '../../common/BasePage';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Experimental MenuButton Testing Initialization', function () {
@@ -16,7 +16,7 @@ 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();
+    await ExperimentalMenuButtonPageObject.scrollToComponentButton(Platform.Win32);
     await ExperimentalMenuButtonPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Persona/pages/{PersonaPageObject.win.ts → PersonaPageObject.ts}

@@ -1,5 +1,5 @@
 import { PERSONA_TESTPAGE, PERSONA_TEST_COMPONENT, HOMEPAGE_PERSONA_BUTTON } from '../../../TestComponents/Persona/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class PersonaPageObject extends BasePage {
   /*****************************************/

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

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

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import PersonaPageObject from '../pages/PersonaPageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import PersonaPageObject from '../pages/PersonaPageObject';
 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('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();
     await PersonaPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

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

package/src/E2E/PersonaCoin/pages/{PersonaCoinPageObject.win.ts → PersonaCoinPageObject.ts}

@@ -1,5 +1,5 @@
 import { PERSONACOIN_TESTPAGE, PERSONACOIN_TEST_COMPONENT, HOMEPAGE_PERSONACOIN_BUTTON } from '../../../TestComponents/PersonaCoin/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class PersonaCoinPageObject extends BasePage {
   /*****************************************/

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

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

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import PersonaCoinPageObject from '../pages/PersonaCoinPageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import PersonaCoinPageObject from '../pages/PersonaCoinPageObject';
 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('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();
     await PersonaCoinPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

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

package/src/E2E/Pressable/pages/{PressablePageObject.win.ts → PressablePageObject.ts}

@@ -1,5 +1,5 @@
 import { PRESSABLE_TESTPAGE, PRESSABLE_TEST_COMPONENT, HOMEPAGE_PRESSABLE_BUTTON } from '../../../TestComponents/Pressable/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class PressablePageObject extends BasePage {
   /*****************************************/

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

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

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import PressablePageObject from '../pages/PressablePageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import PressablePageObject from '../pages/PressablePageObject';
 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('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();
     await PressablePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

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

package/src/E2E/RadioGroup/pages/{RadioGroupPageObject.win.ts → RadioGroupPageObject.ts}

@@ -8,7 +8,7 @@ import {
   THIRD_RADIO_BUTTON,
   FOURTH_RADIO_BUTTON,
 } from '../../../TestComponents/RadioGroup/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 main RadioGroup we are testing has FOUR RadioButtons. The spec file will

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import RadioGroupPageObject from '../pages/RadioGroupPageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import RadioGroupPageObject from '../pages/RadioGroupPageObject';
 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('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();
     await RadioGroupPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

@@ -1,6 +1,6 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
-import RadioGroupPageObject, { RadioButtonSelector } from '../pages/RadioGroupPageObject.win';
-import { ComponentSelector } from '../../common/BasePage.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import RadioGroupPageObject, { RadioButtonSelector } from '../pages/RadioGroupPageObject';
+import { ComponentSelector, Platform } from '../../common/BasePage';
 import { RADIOBUTTON_A11Y_ROLE, RADIOGROUP_A11Y_ROLE, PAGE_TIMEOUT, BOOT_APP_TIMEOUT, Keys } from '../../common/consts';
 import {
   RADIOGROUP_ACCESSIBILITY_LABEL,
@@ -18,7 +18,7 @@ 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();
+    await RadioGroupPageObject.scrollToComponentButton(Platform.Win32);
     await RadioGroupPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Separator/pages/{SeparatorPageObject.win.ts → SeparatorPageObject.ts}

@@ -1,5 +1,5 @@
 import { SEPARATOR_TESTPAGE, SEPARATOR_TEST_COMPONENT, HOMEPAGE_SEPARATOR_BUTTON } from '../../../TestComponents/Separator/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class SeparatorPageObject extends BasePage {
   /*****************************************/

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

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

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import SeparatorPageObject from '../pages/SeparatorPageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import SeparatorPageObject from '../pages/SeparatorPageObject';
 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('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();
     await SeparatorPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

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

package/src/E2E/Shimmer/pages/ShimmerPageObject.win.ts

@@ -1,5 +1,5 @@
 import { HOMEPAGE_SHIMMER_BUTTON, SHIMMER_TESTPAGE, SHIMMER_TEST_COMPONENT } from '../../../TestComponents/Shimmer/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class ShimmerPageObject extends BasePage {
   /*****************************************/

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

@@ -0,0 +1,23 @@
+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 () {
+  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 Shimmer test page', async () => {
+    await ShimmerPageObject.scrollToComponentButton(Platform.iOS);
+    await ShimmerPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+
+    /* Click on component button to navigate to test page */
+    await NavigateAppPage.clickAndGoToShimmerPage();
+    await ShimmerPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+
+    await expect(await ShimmerPageObject.isPageLoaded()).toBeTruthy(ShimmerPageObject.ERRORMESSAGE_PAGELOAD);
+  });
+});

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

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

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

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

package/src/E2E/Svg/pages/{SvgPageObject.win.ts → SvgPageObject.ts}

@@ -1,5 +1,5 @@
 import { SVG_TESTPAGE, SVG_TEST_COMPONENT, HOMEPAGE_SVG_BUTTON } from '../../../TestComponents/Svg/consts';
-import { BasePage, By } from '../../common/BasePage.win';
+import { BasePage, By } from '../../common/BasePage';
 
 class SvgPageObject extends BasePage {
   /*****************************************/

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

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

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

@@ -1,5 +1,5 @@
-import NavigateAppPage from '../../common/NavigateAppPage.macos';
-import SvgPageObject from '../pages/SvgPageObject.macos';
+import NavigateAppPage from '../../common/NavigateAppPage';
+import SvgPageObject from '../pages/SvgPageObject';
 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('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();
     await SvgPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

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

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

package/src/E2E/Switch/pages/SwitchPageObject.ts

@@ -5,7 +5,7 @@ import {
   HOMEPAGE_SWITCH_BUTTON,
   SWITCH_ON_PRESS,
 } from '../../../TestComponents/Switch/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/Switch/specs/Switch.spec.win.ts

@@ -1,7 +1,7 @@
-import NavigateAppPage from '../../common/NavigateAppPage.win';
+import NavigateAppPage from '../../common/NavigateAppPage';
 import SwitchPageObject from '../pages/SwitchPageObject';
 import { SwitchComponentSelector } from '../pages/SwitchPageObject';
-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 { SWITCH_TEST_COMPONENT_LABEL, SWITCH_ACCESSIBILITY_LABEL } from '../../../TestComponents/Switch/consts';
 
@@ -14,7 +14,7 @@ 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();
+    await SwitchPageObject.scrollToComponentButton(Platform.Win32);
     await SwitchPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */

package/src/E2E/Tabs/pages/{TabsPageObject.win.ts → TabsPageObject.ts}

@@ -9,7 +9,7 @@ import {
   SECOND_TABS_ITEM_CONTENT,
   THIRD_TABS_ITEM_CONTENT,
 } from '../../../TestComponents/Tabs/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/Tabs/specs/Tabs.spec.macos.ts

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

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

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

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

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