@fluentui-react-native/tester 0.90.11 → 0.92.1

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

@@ -4,20 +4,20 @@ import { BOOT_APP_TIMEOUT, PAGE_TIMEOUT } from '../../common/consts';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Experimental Tabs Testing Initialization', function () {
-  it('Wait for app load', () => {
-    NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
-    expect(NavigateAppPage.isPageLoaded()).toBeTruthy();
+  it('Wait for app load', async () => {
+    await NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
+    await expect(await NavigateAppPage.isPageLoaded()).toBeTruthy();
   });
 
-  it('Click and navigate to Experimental Tabs test page', () => {
+  it('Click and navigate to Experimental Tabs test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    ExperimentalTabsPageObject.scrollToComponentButton();
-    ExperimentalTabsPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+    await ExperimentalTabsPageObject.scrollToComponentButton();
+    await ExperimentalTabsPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */
-    NavigateAppPage.clickAndGoToExperimentalTabsPage();
-    ExperimentalTabsPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+    await NavigateAppPage.clickAndGoToExperimentalTabsPage();
+    await ExperimentalTabsPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
 
-    expect(ExperimentalTabsPageObject.isPageLoaded()).toBeTruthy();
+    await expect(await ExperimentalTabsPageObject.isPageLoaded()).toBeTruthy();
   });
 });

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

@@ -4,39 +4,39 @@ import { TAB_A11Y_ROLE, TABITEM_A11Y_ROLE, BOOT_APP_TIMEOUT, PAGE_TIMEOUT } from
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Experimental Tabs Testing Initialization', function () {
-  it('Wait for app load', () => {
-    NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
-    expect(NavigateAppPage.isPageLoaded()).toBeTruthy(NavigateAppPage.ERRORMESSAGE_APPLOAD);
+  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 Tabs test page', () => {
+  it('Click and navigate to Experimental Tabs test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    ExperimentalTabsPageObject.scrollToComponentButton();
-    ExperimentalTabsPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+    await ExperimentalTabsPageObject.scrollToComponentButton();
+    await ExperimentalTabsPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */
-    NavigateAppPage.clickAndGoToExperimentalTabsPage();
-    ExperimentalTabsPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+    await NavigateAppPage.clickAndGoToExperimentalTabsPage();
+    await ExperimentalTabsPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
 
-    expect(ExperimentalTabsPageObject.isPageLoaded()).toBeTruthy(ExperimentalTabsPageObject.ERRORMESSAGE_PAGELOAD);
-    expect(ExperimentalTabsPageObject.didAssertPopup()).toBeFalsy(ExperimentalTabsPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
+    await expect(await ExperimentalTabsPageObject.isPageLoaded()).toBeTruthy(ExperimentalTabsPageObject.ERRORMESSAGE_PAGELOAD);
+    await expect(await ExperimentalTabsPageObject.didAssertPopup()).toBeFalsy(ExperimentalTabsPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
   });
 });
 
 describe('Experimental Tabs Accessibility Testing', () => {
-  it("Validate Experimental Tab's accessibilityRole is correct", () => {
-    ExperimentalTabsPageObject.scrollToTestElement();
-    ExperimentalTabsPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
+  it("Validate Experimental Tab's accessibilityRole is correct", async () => {
+    await ExperimentalTabsPageObject.scrollToTestElement();
+    await ExperimentalTabsPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
 
-    expect(ExperimentalTabsPageObject.getAccessibilityRole()).toEqual(TAB_A11Y_ROLE);
-    expect(ExperimentalTabsPageObject.didAssertPopup()).toBeFalsy(ExperimentalTabsPageObject.ERRORMESSAGE_ASSERT);
+    await expect(await ExperimentalTabsPageObject.getAccessibilityRole()).toEqual(TAB_A11Y_ROLE);
+    await expect(await ExperimentalTabsPageObject.didAssertPopup()).toBeFalsy(ExperimentalTabsPageObject.ERRORMESSAGE_ASSERT);
   });
 
-  it("Validate Experimental TabItem's accessibilityRole is correct", () => {
-    ExperimentalTabsPageObject.scrollToTestElement();
-    ExperimentalTabsPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
+  it("Validate Experimental TabItem's accessibilityRole is correct", async () => {
+    await ExperimentalTabsPageObject.scrollToTestElement();
+    await ExperimentalTabsPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
 
-    expect(ExperimentalTabsPageObject.getTabItemAccesibilityRole()).toEqual(TABITEM_A11Y_ROLE);
-    expect(ExperimentalTabsPageObject.didAssertPopup()).toBeFalsy(ExperimentalTabsPageObject.ERRORMESSAGE_ASSERT);
+    await expect(await ExperimentalTabsPageObject.getTabItemAccesibilityRole()).toEqual(TABITEM_A11Y_ROLE);
+    await expect(await ExperimentalTabsPageObject.didAssertPopup()).toBeFalsy(ExperimentalTabsPageObject.ERRORMESSAGE_ASSERT);
   });
 });

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

@@ -4,20 +4,20 @@ import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Text Testing Initialization', function () {
-  it('Wait for app load', () => {
-    NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
-    expect(NavigateAppPage.isPageLoaded()).toBeTruthy();
+  it('Wait for app load', async () => {
+    await NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
+    await expect(await NavigateAppPage.isPageLoaded()).toBeTruthy();
   });
 
-  it('Click and navigate to Text test page', () => {
+  it('Click and navigate to Text test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    TextPageObject.scrollToComponentButton();
-    TextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+    await TextPageObject.scrollToComponentButton();
+    await TextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */
-    NavigateAppPage.clickAndGoToTextPage();
-    TextPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+    await NavigateAppPage.clickAndGoToTextPage();
+    await TextPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
 
-    expect(TextPageObject.isPageLoaded()).toBeTruthy();
+    await expect(await TextPageObject.isPageLoaded()).toBeTruthy();
   });
 });

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

@@ -6,43 +6,43 @@ import { TEXT_ACCESSIBILITY_LABEL, TEXT_COMPONENT_CONTENT } from '../../../TestC
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Text Testing Initialization', function () {
-  it('Wait for app load', () => {
-    NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
-    expect(NavigateAppPage.isPageLoaded()).toBeTruthy(NavigateAppPage.ERRORMESSAGE_APPLOAD);
+  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 Text test page', () => {
+  it('Click and navigate to Text test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    TextPageObject.scrollToComponentButton();
-    TextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+    await TextPageObject.scrollToComponentButton();
+    await TextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */
-    NavigateAppPage.clickAndGoToTextPage();
-    TextPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+    await NavigateAppPage.clickAndGoToTextPage();
+    await TextPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
 
-    expect(TextPageObject.isPageLoaded()).toBeTruthy(TextPageObject.ERRORMESSAGE_PAGELOAD);
-    expect(TextPageObject.didAssertPopup()).toBeFalsy(TextPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
+    await expect(await TextPageObject.isPageLoaded()).toBeTruthy(TextPageObject.ERRORMESSAGE_PAGELOAD);
+    await expect(await TextPageObject.didAssertPopup()).toBeFalsy(TextPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
   });
 });
 
 describe('Text Accessibility Testing', () => {
-  beforeEach(() => {
-    TextPageObject.scrollToTestElement();
-    TextPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
+  beforeEach(async () => {
+    await TextPageObject.scrollToTestElement();
+    await TextPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
   });
 
-  it('Text - Validate accessibilityRole is correct', () => {
-    expect(TextPageObject.getAccessibilityRole()).toEqual(TEXT_A11Y_ROLE);
-    expect(TextPageObject.didAssertPopup()).toBeFalsy(TextPageObject.ERRORMESSAGE_ASSERT);
+  it('Text - Validate accessibilityRole is correct', async () => {
+    await expect(await TextPageObject.getAccessibilityRole()).toEqual(TEXT_A11Y_ROLE);
+    await expect(await TextPageObject.didAssertPopup()).toBeFalsy(TextPageObject.ERRORMESSAGE_ASSERT);
   });
 
-  it('Text - Set accessibilityLabel', () => {
-    expect(TextPageObject.getAccessibilityLabel(ComponentSelector.Primary)).toEqual(TEXT_ACCESSIBILITY_LABEL);
-    expect(TextPageObject.didAssertPopup()).toBeFalsy(TextPageObject.ERRORMESSAGE_ASSERT);
+  it('Text - Set accessibilityLabel', async () => {
+    await expect(await TextPageObject.getAccessibilityLabel(ComponentSelector.Primary)).toEqual(TEXT_ACCESSIBILITY_LABEL);
+    await expect(await TextPageObject.didAssertPopup()).toBeFalsy(TextPageObject.ERRORMESSAGE_ASSERT);
   });
 
-  it('Text - Do not accessibilityLabel -> Default to content', () => {
-    expect(TextPageObject.getAccessibilityLabel(ComponentSelector.Secondary)).toEqual(TEXT_COMPONENT_CONTENT);
-    expect(TextPageObject.didAssertPopup()).toBeFalsy(TextPageObject.ERRORMESSAGE_ASSERT);
+  it('Text - Do not accessibilityLabel -> Default to content', async () => {
+    await expect(await TextPageObject.getAccessibilityLabel(ComponentSelector.Secondary)).toEqual(TEXT_COMPONENT_CONTENT);
+    await expect(await TextPageObject.didAssertPopup()).toBeFalsy(TextPageObject.ERRORMESSAGE_ASSERT);
   });
 });

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

@@ -4,31 +4,31 @@ import { TEXT_A11Y_ROLE, PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/con
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Experimental Text Testing Initialization', function () {
-  it('Wait for app load', () => {
-    NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
-    expect(NavigateAppPage.isPageLoaded()).toBeTruthy(NavigateAppPage.ERRORMESSAGE_APPLOAD);
+  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 Text test page', () => {
+  it('Click and navigate to Experimental Text test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    ExperimentalTextPageObject.scrollToComponentButton();
-    ExperimentalTextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+    await ExperimentalTextPageObject.scrollToComponentButton();
+    await ExperimentalTextPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */
-    NavigateAppPage.clickAndGoToExperimentalTextPage();
-    ExperimentalTextPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+    await NavigateAppPage.clickAndGoToExperimentalTextPage();
+    await ExperimentalTextPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
 
-    expect(ExperimentalTextPageObject.isPageLoaded()).toBeTruthy(ExperimentalTextPageObject.ERRORMESSAGE_PAGELOAD);
-    expect(ExperimentalTextPageObject.didAssertPopup()).toBeFalsy(ExperimentalTextPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
+    await expect(await ExperimentalTextPageObject.isPageLoaded()).toBeTruthy(ExperimentalTextPageObject.ERRORMESSAGE_PAGELOAD);
+    await expect(await ExperimentalTextPageObject.didAssertPopup()).toBeFalsy(ExperimentalTextPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
   });
 });
 
 describe('Experimental Text Accessibility Testing', () => {
-  it('Text - Validate accessibilityRole is correct', () => {
-    ExperimentalTextPageObject.scrollToTestElement();
-    ExperimentalTextPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
+  it('Text - Validate accessibilityRole is correct', async () => {
+    await ExperimentalTextPageObject.scrollToTestElement();
+    await ExperimentalTextPageObject.waitForPrimaryElementDisplayed(PAGE_TIMEOUT);
 
-    expect(ExperimentalTextPageObject.getAccessibilityRole()).toEqual(TEXT_A11Y_ROLE);
-    expect(ExperimentalTextPageObject.didAssertPopup()).toBeFalsy(ExperimentalTextPageObject.ERRORMESSAGE_ASSERT);
+    await expect(await ExperimentalTextPageObject.getAccessibilityRole()).toEqual(TEXT_A11Y_ROLE);
+    await expect(await ExperimentalTextPageObject.didAssertPopup()).toBeFalsy(ExperimentalTextPageObject.ERRORMESSAGE_ASSERT);
   });
 });

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

@@ -4,21 +4,21 @@ import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Theme Testing Initialization', function () {
-  it('Wait for app load', () => {
-    NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
-    expect(NavigateAppPage.isPageLoaded()).toBeTruthy(NavigateAppPage.ERRORMESSAGE_APPLOAD);
+  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 Theme test page', () => {
+  it('Click and navigate to Theme test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    ThemePageObject.scrollToComponentButton();
-    ThemePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+    await ThemePageObject.scrollToComponentButton();
+    await ThemePageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */
-    NavigateAppPage.clickAndGoToThemePage();
-    ThemePageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+    await NavigateAppPage.clickAndGoToThemePage();
+    await ThemePageObject.waitForPageDisplayed(PAGE_TIMEOUT);
 
-    expect(ThemePageObject.isPageLoaded()).toBeTruthy(ThemePageObject.ERRORMESSAGE_PAGELOAD);
-    expect(ThemePageObject.didAssertPopup()).toBeFalsy(ThemePageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
+    await expect(await ThemePageObject.isPageLoaded()).toBeTruthy(ThemePageObject.ERRORMESSAGE_PAGELOAD);
+    await expect(await ThemePageObject.didAssertPopup()).toBeFalsy(ThemePageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
   });
 });

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

@@ -4,21 +4,21 @@ import { PAGE_TIMEOUT, BOOT_APP_TIMEOUT } from '../../common/consts';
 
 // Before testing begins, allow up to 60 seconds for app to open
 describe('Tokens Testing Initialization', function () {
-  it('Wait for app load', () => {
-    NavigateAppPage.waitForPageDisplayed(BOOT_APP_TIMEOUT);
-    expect(NavigateAppPage.isPageLoaded()).toBeTruthy(NavigateAppPage.ERRORMESSAGE_APPLOAD);
+  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 Tokens test page', () => {
+  it('Click and navigate to Tokens test page', async () => {
     /* Scroll to component test page button in scrollview if not already visible*/
-    TokenPageObject.scrollToComponentButton();
-    TokenPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
+    await TokenPageObject.scrollToComponentButton();
+    await TokenPageObject.waitForButtonDisplayed(PAGE_TIMEOUT);
 
     /* Click on component button to navigate to test page */
-    NavigateAppPage.clickAndGoToTokensPage();
-    TokenPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
+    await NavigateAppPage.clickAndGoToTokensPage();
+    await TokenPageObject.waitForPageDisplayed(PAGE_TIMEOUT);
 
-    expect(TokenPageObject.isPageLoaded()).toBeTruthy(TokenPageObject.ERRORMESSAGE_PAGELOAD);
-    expect(TokenPageObject.didAssertPopup()).toBeFalsy(TokenPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
+    await expect(await TokenPageObject.isPageLoaded()).toBeTruthy(TokenPageObject.ERRORMESSAGE_PAGELOAD);
+    await expect(await TokenPageObject.didAssertPopup()).toBeFalsy(TokenPageObject.ERRORMESSAGE_ASSERT); // Ensure no asserts popped up
   });
 });

package/src/E2E/common/BasePage.macos.ts

@@ -3,7 +3,7 @@ export const COMPONENT_SCROLL_COORDINATES = { x: -0, y: -100 }; // These are the
 
 /* Mac-Specific Selector. We use this to get elements on the test page.
  * Specifically, this is the xpath selector. See https://v6.webdriver.io/docs/selectors.html#xpath */
-export function By(identifier: string): WebdriverIO.Element {
+export function By(identifier: string) {
   return $('//*[@identifier="' + identifier + '"]');
 }
 
@@ -26,100 +26,84 @@ export class BasePage {
   /******************************************************************/
   /**************** UI Element Interaction Methods ******************/
   /******************************************************************/
-  getAccessibilityRole(): string {
-    return this._primaryComponent.getAttribute('ControlType');
+  async getAccessibilityRole(): Promise<string> {
+    return await this._primaryComponent.getAttribute('ControlType');
   }
 
   /* Gets the accessibility label of an UI element given the selector */
-  getAccessibilityLabel(componentSelector: ComponentSelector): string {
+  async getAccessibilityLabel(componentSelector: ComponentSelector): Promise<string> {
     switch (componentSelector) {
       case ComponentSelector.Primary:
-        return this._primaryComponent.getAttribute('Name');
+        return await this._primaryComponent.getAttribute('Name');
 
       case ComponentSelector.Secondary:
-        return this._secondaryComponent.getAttribute('Name');
+        return await this._secondaryComponent.getAttribute('Name');
     }
   }
 
   /* Returns true if the test page has loaded. To determine if it's loaded, each test page has a specific UI element we attempt to locate.
    * If this UI element is located, we know the page as loaded correctly. The UI element we look for is a Text component that contains
    * the title of the page (this._testPage returns that UI element)  */
-  isPageLoaded(): boolean {
-    return this._testPage.isDisplayed();
+  async isPageLoaded(): Promise<boolean> {
+    return await this._testPage.isDisplayed();
   }
 
   /* Returns true if the test page's button is displayed (the button that navigates to each test page) */
-  isButtonInView(): boolean {
-    return this._pageButton.isDisplayed();
+  async isButtonInView(): Promise<boolean> {
+    return await this._pageButton.isDisplayed();
+  }
+
+  async clickComponent(): Promise<void> {
+    await this._primaryComponent.click();
   }
 
   /* 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 */
-  scrollToComponentButton(): void {
-    /* TODO: Implement (not needed yet) */
+  async scrollToComponentButton(): Promise<void> {
+    /* Not Needed Yet */
   }
 
   /* Waits for the test page to load. If the test page doesn't load before the timeout, it causes the test to fail. */
-  waitForPageDisplayed(timeout?: number): void {
-    browser.waitUntil(
-      () => {
-        return this.isPageLoaded();
-      },
-      {
-        timeout: timeout ?? this.waitForPageTimeout,
-        timeoutMsg: this._pageName + ' did not render correctly. Please see /errorShots for more information.',
-        interval: 1000,
-      },
-    );
+  async waitForPageDisplayed(timeout?: number): Promise<void> {
+    await browser.waitUntil(async () => await this.isPageLoaded(), {
+      timeout: timeout ?? this.waitForPageTimeout,
+      timeoutMsg: this._pageName + ' did not render correctly. Please see /errorShots for more information.',
+      interval: 1500,
+    });
   }
 
   /* Waits for the test page's button to be displayed. If the button doesn't load before the timeout, it causes the test to fail. */
-  waitForButtonDisplayed(timeout?: number): void {
-    browser.waitUntil(
-      () => {
-        return this.isButtonInView();
-      },
-      {
-        timeout: timeout ?? this.waitForPageTimeout,
-        timeoutMsg: 'Could not find the button to navigate to ' + this._pageName + '. Please see /errorShots for more information.',
-        interval: 1000,
-      },
-    );
+  async waitForButtonDisplayed(timeout?: number): Promise<void> {
+    await browser.waitUntil(async () => await this.isButtonInView(), {
+      timeout: timeout ?? this.waitForPageTimeout,
+      timeoutMsg: 'Could not find the button to navigate to ' + this._pageName + '. Please see /errorShots for more information.',
+      interval: 1500,
+    });
   }
 
   /* Waits for the primary UI test element to be displayed. If the element doesn't load before the timeout, it causes the test to fail. */
-  waitForPrimaryElementDisplayed(timeout?: number): void {
-    browser.waitUntil(
-      () => {
-        return this._primaryComponent.isDisplayed();
-      },
-      {
-        timeout: timeout ?? this.waitForPageTimeout,
-        timeoutMsg:
-          'The primary UI element for testing did not display correctly. Please see /errorShots of the first failed test for more information.',
-        interval: 1000,
-      },
-    );
+  async waitForPrimaryElementDisplayed(timeout?: number): Promise<void> {
+    await browser.waitUntil(async () => await this._primaryComponent.isDisplayed(), {
+      timeout: timeout ?? this.waitForPageTimeout,
+      timeoutMsg:
+        'The primary UI element for testing did not display correctly. Please see /errorShots of the first failed test for more information.',
+      interval: 1500,
+    });
   }
 
   /* Scrolls to the primary UI test element until it is displayed. It uses the ScrollView that encapsulates each test page. */
-  scrollToTestElement(): void {
-    /* TODO: Implement (not needed yet) */
+  async scrollToTestElement(): Promise<void> {
+    /* Not Needed Yet */
   }
 
   /* A method that allows the caller to pass in a condition. A wrapper for waitUntil(). Once testing becomes more extensive,
    * this will allow cleaner code within all the Page Objects. */
-  waitForCondition(condition?: () => boolean, errorMsg?: string, timeout?: number): void {
-    browser.waitUntil(
-      () => {
-        return condition();
-      },
-      {
-        timeout: timeout ?? this.waitForPageTimeout,
-        timeoutMsg: errorMsg ?? 'Error. Please see /errorShots and logs for more information.',
-        interval: 1000,
-      },
-    );
+  async waitForCondition(condition?: () => Promise<boolean>, errorMsg?: string, timeout?: number): Promise<void> {
+    await browser.waitUntil(async () => await condition(), {
+      timeout: timeout ?? this.waitForPageTimeout,
+      timeoutMsg: errorMsg ?? 'Error. Please see /errorShots and logs for more information.',
+      interval: 1000,
+    });
   }
 
   /*****************************************/
@@ -134,26 +118,26 @@ export class BasePage {
 
   // Returns: UI Element
   // The Text component on each test page containing the title of that page. We can use this to determine if a test page has loaded correctly.
-  get _testPage(): WebdriverIO.Element {
+  get _testPage() {
     return By(DUMMY_CHAR);
   }
 
   // Returns: UI Element
   // The primary UI element used for testing on the given test page.
-  get _primaryComponent(): WebdriverIO.Element {
+  get _primaryComponent() {
     return By(DUMMY_CHAR);
   }
 
   // Returns: UI Element
   // The secondary UI element used for testing on the given test page. Often times, we'll want to set a
   // prop on one component, and not set it on another to verify certain behaviors. This is why we have this secondary component.
-  get _secondaryComponent(): WebdriverIO.Element {
+  get _secondaryComponent() {
     return By(DUMMY_CHAR);
   }
 
   // Returns: UI Element
   // The button that navigates you to the component's test page.
-  get _pageButton(): WebdriverIO.Element {
+  get _pageButton() {
     return By(DUMMY_CHAR);
   }