From e2a14e420e509d885615f7103b12ea57f31924c4 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Tue, 11 Aug 2020 22:55:19 -0700
Subject: [PATCH 01/20] re-enable

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index a05a184ea8e..4c5c5677f26 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -7,8 +7,6 @@ import { BasePage, By } from '../pages/BasePage';
 
 let pages = [
   '<ActivityIndicator>',
-  /*  TODO:  Disabling most of the test for now due to
-             instability, tracked by #5661
   '<Button>',
   //  'Custom Views',
   '<DatePicker>',
@@ -69,12 +67,12 @@ let pages = [
   //  '<LegacyDirectManipulationTest>',
   //  '<LegacyImageTest>',
   //  '<LegacyAccessibilityTest>',
-*/
 ];
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
-    By(page).click();
+    let pageItem = By(page);
+    pageItem.click();
     this.waitForPageLoaded();
   }
   backToHomePage() {

From a9ee06d9fc276986501300ca64d26d3fa73b9869 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Wed, 12 Aug 2020 00:05:01 -0700
Subject: [PATCH 02/20] comment out PlatformColor test, this was the failing
 test in the past as well

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 4c5c5677f26..fa65e87a3ec 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -52,7 +52,7 @@ let pages = [
   'Layout - Flexbox',
   'Native Animated Example',
   'PanResponder Sample',
-  'PlatformColor',
+//  'PlatformColor',
   'Pointer Events',
   'RTLExample',
   'Share',

From 72e718418d8926ea63ed43b77c0ae5b520a5b2c7 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Wed, 12 Aug 2020 00:59:00 -0700
Subject: [PATCH 03/20] trying again, this time commenting out PanResponder
 Sample, which comes just before the failing test

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index fa65e87a3ec..37202c6a241 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -51,8 +51,8 @@ let pages = [
   'Linking',
   'Layout - Flexbox',
   'Native Animated Example',
-  'PanResponder Sample',
-//  'PlatformColor',
+//  'PanResponder Sample',
+  'PlatformColor',
   'Pointer Events',
   'RTLExample',
   'Share',

From b1838cf5a10b106712717cbe26d797cc2bb83e8e Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Wed, 12 Aug 2020 15:00:36 -0700
Subject: [PATCH 04/20] trying to wait for home page to load before continuing

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 37202c6a241..a5cdaa4003d 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -51,7 +51,7 @@ let pages = [
   'Linking',
   'Layout - Flexbox',
   'Native Animated Example',
-//  'PanResponder Sample',
+  'PanResponder Sample',
   'PlatformColor',
   'Pointer Events',
   'RTLExample',
@@ -77,6 +77,7 @@ class TestPage extends BasePage {
   }
   backToHomePage() {
     this.homeButton.click();
+    By('explorer_search');
   }
 }
 

From 2719bde81027395bfa2b42390c05f4a16407a2f7 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Wed, 12 Aug 2020 15:43:14 -0700
Subject: [PATCH 05/20] another take on waiting for item in FlatList to be
 loaded first

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index a5cdaa4003d..84f7e47b0b0 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -71,13 +71,24 @@ let pages = [
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
+    this.waitForItemLoaded(page);
     let pageItem = By(page);
     pageItem.click();
     this.waitForPageLoaded();
   }
   backToHomePage() {
     this.homeButton.click();
-    By('explorer_search');
+  }
+
+  waitForItemLoaded(item: string, timeout?: number) {
+    // eslint-disable-next-line no-undef
+    browser.waitUntil(
+      () => {
+        return By(item).isExisting();
+      },
+      this.timeoutForPageLoaded(timeout),
+      'Wait for item ' + item + ' timeout'
+    );
   }
 }
 

From 9490f102cb0aebd36434810c0f6e83ff7b07d42f Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Wed, 12 Aug 2020 21:31:47 -0700
Subject: [PATCH 06/20] trying new approach, enter test name in edit box to
 filter first

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 84f7e47b0b0..1ce60a0720b 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -27,7 +27,7 @@ let pages = [
   '<Switch>',
   '<Text>',
   '<TextInput>',
-  '<Touchable*> and onPress',
+  //'<Touchable*> and onPress',
   '<TransferProperties>',
   '<TransparentHitTestExample>',
   '<View>',
@@ -71,7 +71,8 @@ let pages = [
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
-    this.waitForItemLoaded(page);
+    let editBox = By('explorer_search');
+    editBox.setValue(page);
     let pageItem = By(page);
     pageItem.click();
     this.waitForPageLoaded();

From 6f082df15cf9e8989ed6644a43e4f34685978f17 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Wed, 12 Aug 2020 22:32:50 -0700
Subject: [PATCH 07/20] made some progress, now timing out on edit control, add
 polling for that control

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 1ce60a0720b..c6ab0518b7f 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -71,6 +71,7 @@ let pages = [
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
+    this.waitForHomePageLoaded();
     let editBox = By('explorer_search');
     editBox.setValue(page);
     let pageItem = By(page);
@@ -81,14 +82,14 @@ class TestPage extends BasePage {
     this.homeButton.click();
   }
 
-  waitForItemLoaded(item: string, timeout?: number) {
+  waitForHomePageLoaded(timeout?: number) {
     // eslint-disable-next-line no-undef
     browser.waitUntil(
       () => {
-        return By(item).isExisting();
+        return By('explorer_search').isDisplayed();
       },
       this.timeoutForPageLoaded(timeout),
-      'Wait for item ' + item + ' timeout'
+      'Wait for HomePage load timeout'
     );
   }
 }

From 86933668747d54ceb004e59670fe93030af3dbf9 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Wed, 12 Aug 2020 23:59:23 -0700
Subject: [PATCH 08/20] finally!  success.  Try #2

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index c6ab0518b7f..52225d05b56 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -71,6 +71,8 @@ let pages = [
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
+
+    // Filter the list down to the one test, to improve stability of selectors
     this.waitForHomePageLoaded();
     let editBox = By('explorer_search');
     editBox.setValue(page);

From 7cdc0b607732e63910f535c72b6503b709993f64 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Thu, 13 Aug 2020 00:40:32 -0700
Subject: [PATCH 09/20] try #3, fingers crossed!

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 52225d05b56..f12409069bf 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -71,7 +71,6 @@ let pages = [
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
-
     // Filter the list down to the one test, to improve stability of selectors
     this.waitForHomePageLoaded();
     let editBox = By('explorer_search');

From cc3bae249017ea6df1bc9df205906f10f98078d5 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Thu, 13 Aug 2020 09:58:00 -0700
Subject: [PATCH 10/20] try #4

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index f12409069bf..8f0c6b21d0e 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -90,7 +90,7 @@ class TestPage extends BasePage {
         return By('explorer_search').isDisplayed();
       },
       this.timeoutForPageLoaded(timeout),
-      'Wait for HomePage load timeout'
+      'Wait for HomePage load timed out'
     );
   }
 }

From 0d4aed496efbbdcb01628b81cb5a738c36d1dee0 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Thu, 13 Aug 2020 16:33:49 -0700
Subject: [PATCH 11/20] split test into groups

---
 .../E2ETest/wdio/test/VisitAllPages.spec.ts   |  2 +
 .../wdio/test/VisitAllPagesPart2.spec.ts      | 60 ++++++++++++++++++
 .../wdio/test/VisitAllPagesPart3.spec.ts      | 61 +++++++++++++++++++
 .../wdio/test/VisitAllPagesPart4.spec.ts      | 56 +++++++++++++++++
 4 files changed, 179 insertions(+)
 create mode 100644 packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
 create mode 100644 packages/E2ETest/wdio/test/VisitAllPagesPart3.spec.ts
 create mode 100644 packages/E2ETest/wdio/test/VisitAllPagesPart4.spec.ts

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 8f0c6b21d0e..578d047ae43 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -21,6 +21,7 @@ let pages = [
   '<PickerWindows>',
   '<Pressable>',
   '<Popup>',
+  /*
   'Keyboard extension Example',
   '<ScrollViewSimpleExample>',
   //  '<SectionList>',
@@ -60,6 +61,7 @@ let pages = [
   'AppTheme',
   'WebSocket',
   'Transforms',
+  */
   //  '<LegacyControlStyleTest>',
   //  '<LegacyTransformTest>',
   //  '<LegacyTextInputTest>',
diff --git a/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts b/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
new file mode 100644
index 00000000000..e2dbe107e28
--- /dev/null
+++ b/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ */
+
+import { BasePage, By } from '../pages/BasePage';
+
+let pages = [
+  'Keyboard extension Example',
+  '<ScrollViewSimpleExample>',
+  //  '<SectionList>',
+  '<Switch>',
+  '<Text>',
+  '<TextInput>',
+  //'<Touchable*> and onPress',
+  '<TransferProperties>',
+  '<TransparentHitTestExample>',
+  '<View>',
+  'Keyboard Focus Example',
+  //  'Accessibility',
+  'Accessibility Windows',
+  'AsyncStorage Windows',
+];
+
+class TestPage extends BasePage {
+  goToTestPage(page: string) {
+    // Filter the list down to the one test, to improve stability of selectors
+    this.waitForHomePageLoaded();
+    let editBox = By('explorer_search');
+    editBox.setValue(page);
+    let pageItem = By(page);
+    pageItem.click();
+    this.waitForPageLoaded();
+  }
+  backToHomePage() {
+    this.homeButton.click();
+  }
+
+  waitForHomePageLoaded(timeout?: number) {
+    // eslint-disable-next-line no-undef
+    browser.waitUntil(
+      () => {
+        return By('explorer_search').isDisplayed();
+      },
+      this.timeoutForPageLoaded(timeout),
+      'Wait for HomePage load timed out'
+    );
+  }
+}
+
+describe('VisitAllPagesTest', () => {
+  pages.forEach(function(page) {
+    it(page, () => {
+      console.log('loading page ' + page);
+      let testPage = new TestPage();
+      testPage.goToTestPage(page);
+      testPage.backToHomePage();
+    });
+  });
+});
diff --git a/packages/E2ETest/wdio/test/VisitAllPagesPart3.spec.ts b/packages/E2ETest/wdio/test/VisitAllPagesPart3.spec.ts
new file mode 100644
index 00000000000..57c93f14d97
--- /dev/null
+++ b/packages/E2ETest/wdio/test/VisitAllPagesPart3.spec.ts
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ */
+
+import { BasePage, By } from '../pages/BasePage';
+
+let pages = [
+  'Alert',
+  'Animated - Examples',
+  'Animated - Gratuitous App',
+  'Appearance',
+  'AppState',
+  'Border',
+  'Box Shadow',
+  'Clipboard',
+  'Crash',
+  'DevSettings',
+  'Dimensions',
+  'Keyboard',
+  'Layout Events',
+  'Linking',
+  'Layout - Flexbox',
+];
+
+class TestPage extends BasePage {
+  goToTestPage(page: string) {
+    // Filter the list down to the one test, to improve stability of selectors
+    this.waitForHomePageLoaded();
+    let editBox = By('explorer_search');
+    editBox.setValue(page);
+    let pageItem = By(page);
+    pageItem.click();
+    this.waitForPageLoaded();
+  }
+  backToHomePage() {
+    this.homeButton.click();
+  }
+
+  waitForHomePageLoaded(timeout?: number) {
+    // eslint-disable-next-line no-undef
+    browser.waitUntil(
+      () => {
+        return By('explorer_search').isDisplayed();
+      },
+      this.timeoutForPageLoaded(timeout),
+      'Wait for HomePage load timed out'
+    );
+  }
+}
+
+describe('VisitAllPagesTest', () => {
+  pages.forEach(function(page) {
+    it(page, () => {
+      console.log('loading page ' + page);
+      let testPage = new TestPage();
+      testPage.goToTestPage(page);
+      testPage.backToHomePage();
+    });
+  });
+});
diff --git a/packages/E2ETest/wdio/test/VisitAllPagesPart4.spec.ts b/packages/E2ETest/wdio/test/VisitAllPagesPart4.spec.ts
new file mode 100644
index 00000000000..a4e11b6c9d1
--- /dev/null
+++ b/packages/E2ETest/wdio/test/VisitAllPagesPart4.spec.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ */
+
+import { BasePage, By } from '../pages/BasePage';
+
+let pages = [
+  'Native Animated Example',
+  'PanResponder Sample',
+  'PlatformColor',
+  'Pointer Events',
+  'RTLExample',
+  'Share',
+  'Timers',
+  'AppTheme',
+  'WebSocket',
+  'Transforms',
+];
+
+class TestPage extends BasePage {
+  goToTestPage(page: string) {
+    // Filter the list down to the one test, to improve stability of selectors
+    this.waitForHomePageLoaded();
+    let editBox = By('explorer_search');
+    editBox.setValue(page);
+    let pageItem = By(page);
+    pageItem.click();
+    this.waitForPageLoaded();
+  }
+  backToHomePage() {
+    this.homeButton.click();
+  }
+
+  waitForHomePageLoaded(timeout?: number) {
+    // eslint-disable-next-line no-undef
+    browser.waitUntil(
+      () => {
+        return By('explorer_search').isDisplayed();
+      },
+      this.timeoutForPageLoaded(timeout),
+      'Wait for HomePage load timed out'
+    );
+  }
+}
+
+describe('VisitAllPagesTest', () => {
+  pages.forEach(function(page) {
+    it(page, () => {
+      console.log('loading page ' + page);
+      let testPage = new TestPage();
+      testPage.goToTestPage(page);
+      testPage.backToHomePage();
+    });
+  });
+});

From e773c1ac7565b5e988b45132a4e7236449c46cbb Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Thu, 13 Aug 2020 17:16:26 -0700
Subject: [PATCH 12/20] bumping up timeout

---
 packages/E2ETest/wdio/pages/BasePage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/pages/BasePage.ts b/packages/E2ETest/wdio/pages/BasePage.ts
index 52e5ebd4aca..80db3b281e2 100644
--- a/packages/E2ETest/wdio/pages/BasePage.ts
+++ b/packages/E2ETest/wdio/pages/BasePage.ts
@@ -86,5 +86,5 @@ export class BasePage {
   }
 
   // Default timeout for waitForPageLoaded command in PageObject
-  private waitforPageTimeout: number = 10000;
+  private waitforPageTimeout: number = 60000;
 }

From 5894795fda944ee36e20d9c667e439c3ae94de92 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Thu, 13 Aug 2020 17:52:02 -0700
Subject: [PATCH 13/20] try #2 with longer timeout

---
 packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts b/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
index e2dbe107e28..982d08e6b6e 100644
--- a/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
@@ -24,7 +24,7 @@ let pages = [
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
-    // Filter the list down to the one test, to improve stability of selectors
+    // Filter the list down to the one test, to improve the stability of selectors
     this.waitForHomePageLoaded();
     let editBox = By('explorer_search');
     editBox.setValue(page);

From 668222e66ca3c845b4b06fcc7adfac80f5545fd9 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Thu, 13 Aug 2020 21:13:23 -0700
Subject: [PATCH 14/20] go back to one testspec

---
 .../E2ETest/wdio/test/VisitAllPages.spec.ts   |  2 -
 .../wdio/test/VisitAllPagesPart2.spec.ts      | 60 ------------------
 .../wdio/test/VisitAllPagesPart3.spec.ts      | 61 -------------------
 .../wdio/test/VisitAllPagesPart4.spec.ts      | 56 -----------------
 4 files changed, 179 deletions(-)
 delete mode 100644 packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
 delete mode 100644 packages/E2ETest/wdio/test/VisitAllPagesPart3.spec.ts
 delete mode 100644 packages/E2ETest/wdio/test/VisitAllPagesPart4.spec.ts

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 578d047ae43..8f0c6b21d0e 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -21,7 +21,6 @@ let pages = [
   '<PickerWindows>',
   '<Pressable>',
   '<Popup>',
-  /*
   'Keyboard extension Example',
   '<ScrollViewSimpleExample>',
   //  '<SectionList>',
@@ -61,7 +60,6 @@ let pages = [
   'AppTheme',
   'WebSocket',
   'Transforms',
-  */
   //  '<LegacyControlStyleTest>',
   //  '<LegacyTransformTest>',
   //  '<LegacyTextInputTest>',
diff --git a/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts b/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
deleted file mode 100644
index 982d08e6b6e..00000000000
--- a/packages/E2ETest/wdio/test/VisitAllPagesPart2.spec.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- */
-
-import { BasePage, By } from '../pages/BasePage';
-
-let pages = [
-  'Keyboard extension Example',
-  '<ScrollViewSimpleExample>',
-  //  '<SectionList>',
-  '<Switch>',
-  '<Text>',
-  '<TextInput>',
-  //'<Touchable*> and onPress',
-  '<TransferProperties>',
-  '<TransparentHitTestExample>',
-  '<View>',
-  'Keyboard Focus Example',
-  //  'Accessibility',
-  'Accessibility Windows',
-  'AsyncStorage Windows',
-];
-
-class TestPage extends BasePage {
-  goToTestPage(page: string) {
-    // Filter the list down to the one test, to improve the stability of selectors
-    this.waitForHomePageLoaded();
-    let editBox = By('explorer_search');
-    editBox.setValue(page);
-    let pageItem = By(page);
-    pageItem.click();
-    this.waitForPageLoaded();
-  }
-  backToHomePage() {
-    this.homeButton.click();
-  }
-
-  waitForHomePageLoaded(timeout?: number) {
-    // eslint-disable-next-line no-undef
-    browser.waitUntil(
-      () => {
-        return By('explorer_search').isDisplayed();
-      },
-      this.timeoutForPageLoaded(timeout),
-      'Wait for HomePage load timed out'
-    );
-  }
-}
-
-describe('VisitAllPagesTest', () => {
-  pages.forEach(function(page) {
-    it(page, () => {
-      console.log('loading page ' + page);
-      let testPage = new TestPage();
-      testPage.goToTestPage(page);
-      testPage.backToHomePage();
-    });
-  });
-});
diff --git a/packages/E2ETest/wdio/test/VisitAllPagesPart3.spec.ts b/packages/E2ETest/wdio/test/VisitAllPagesPart3.spec.ts
deleted file mode 100644
index 57c93f14d97..00000000000
--- a/packages/E2ETest/wdio/test/VisitAllPagesPart3.spec.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- */
-
-import { BasePage, By } from '../pages/BasePage';
-
-let pages = [
-  'Alert',
-  'Animated - Examples',
-  'Animated - Gratuitous App',
-  'Appearance',
-  'AppState',
-  'Border',
-  'Box Shadow',
-  'Clipboard',
-  'Crash',
-  'DevSettings',
-  'Dimensions',
-  'Keyboard',
-  'Layout Events',
-  'Linking',
-  'Layout - Flexbox',
-];
-
-class TestPage extends BasePage {
-  goToTestPage(page: string) {
-    // Filter the list down to the one test, to improve stability of selectors
-    this.waitForHomePageLoaded();
-    let editBox = By('explorer_search');
-    editBox.setValue(page);
-    let pageItem = By(page);
-    pageItem.click();
-    this.waitForPageLoaded();
-  }
-  backToHomePage() {
-    this.homeButton.click();
-  }
-
-  waitForHomePageLoaded(timeout?: number) {
-    // eslint-disable-next-line no-undef
-    browser.waitUntil(
-      () => {
-        return By('explorer_search').isDisplayed();
-      },
-      this.timeoutForPageLoaded(timeout),
-      'Wait for HomePage load timed out'
-    );
-  }
-}
-
-describe('VisitAllPagesTest', () => {
-  pages.forEach(function(page) {
-    it(page, () => {
-      console.log('loading page ' + page);
-      let testPage = new TestPage();
-      testPage.goToTestPage(page);
-      testPage.backToHomePage();
-    });
-  });
-});
diff --git a/packages/E2ETest/wdio/test/VisitAllPagesPart4.spec.ts b/packages/E2ETest/wdio/test/VisitAllPagesPart4.spec.ts
deleted file mode 100644
index a4e11b6c9d1..00000000000
--- a/packages/E2ETest/wdio/test/VisitAllPagesPart4.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- */
-
-import { BasePage, By } from '../pages/BasePage';
-
-let pages = [
-  'Native Animated Example',
-  'PanResponder Sample',
-  'PlatformColor',
-  'Pointer Events',
-  'RTLExample',
-  'Share',
-  'Timers',
-  'AppTheme',
-  'WebSocket',
-  'Transforms',
-];
-
-class TestPage extends BasePage {
-  goToTestPage(page: string) {
-    // Filter the list down to the one test, to improve stability of selectors
-    this.waitForHomePageLoaded();
-    let editBox = By('explorer_search');
-    editBox.setValue(page);
-    let pageItem = By(page);
-    pageItem.click();
-    this.waitForPageLoaded();
-  }
-  backToHomePage() {
-    this.homeButton.click();
-  }
-
-  waitForHomePageLoaded(timeout?: number) {
-    // eslint-disable-next-line no-undef
-    browser.waitUntil(
-      () => {
-        return By('explorer_search').isDisplayed();
-      },
-      this.timeoutForPageLoaded(timeout),
-      'Wait for HomePage load timed out'
-    );
-  }
-}
-
-describe('VisitAllPagesTest', () => {
-  pages.forEach(function(page) {
-    it(page, () => {
-      console.log('loading page ' + page);
-      let testPage = new TestPage();
-      testPage.goToTestPage(page);
-      testPage.backToHomePage();
-    });
-  });
-});

From 6d3ab362c751996bf437442736a1fc9043e6cb6d Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Thu, 13 Aug 2020 23:22:34 -0700
Subject: [PATCH 15/20] try #4 with longer timeout

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 8f0c6b21d0e..850f644e1d8 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -71,7 +71,7 @@ let pages = [
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
-    // Filter the list down to the one test, to improve stability of selectors
+    // Filter the list down to the one test, to improve the stability of selectors
     this.waitForHomePageLoaded();
     let editBox = By('explorer_search');
     editBox.setValue(page);

From de4f1383ffb3d88eac9d64e6c078e680ed41f2c3 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Fri, 14 Aug 2020 00:01:53 -0700
Subject: [PATCH 16/20] try #5 with longer timeout.  really folks I think I got
 it this time :)

---
 packages/E2ETest/wdio/test/VisitAllPages.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 850f644e1d8..8f0c6b21d0e 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -71,7 +71,7 @@ let pages = [
 
 class TestPage extends BasePage {
   goToTestPage(page: string) {
-    // Filter the list down to the one test, to improve the stability of selectors
+    // Filter the list down to the one test, to improve stability of selectors
     this.waitForHomePageLoaded();
     let editBox = By('explorer_search');
     editBox.setValue(page);

From 8d6a4ecf39f6ef75248b256e6f376d214af60520 Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Mon, 17 Aug 2020 15:17:51 -0700
Subject: [PATCH 17/20] convert all the tests to use same mechanism

---
 packages/E2ETest/wdio/pages/BasePage.ts       | 14 +--
 .../E2ETest/wdio/pages/ControlStylePage.ts    |  9 --
 .../wdio/pages/DirectManipulationPage.ts      |  9 --
 packages/E2ETest/wdio/pages/HomePage.ts       | 86 +++----------------
 packages/E2ETest/wdio/pages/ImageTestPage.ts  |  9 --
 packages/E2ETest/wdio/pages/LoginPage.ts      |  4 -
 .../E2ETest/wdio/pages/TextInputTestPage.ts   |  4 -
 .../E2ETest/wdio/pages/TransformTestPage.ts   |  9 --
 .../E2ETest/wdio/test/AAA_SmokeTest.spec.ts   |  5 +-
 .../wdio/test/DirectManipulation.spec.ts      |  3 +-
 packages/E2ETest/wdio/test/Image.spec.ts      |  3 +-
 .../E2ETest/wdio/test/TransformTest.spec.ts   |  3 +-
 .../E2ETest/wdio/test/VisitAllPages.spec.ts   | 33 +------
 .../E2ETest/wdio/test/controlStyle.spec.ts    |  3 +-
 packages/E2ETest/wdio/test/login.spec.ts      |  3 +-
 packages/E2ETest/wdio/test/testInput.spec.ts  |  3 +-
 .../js/examples-win/LegacyTests/Consts.ts     |  1 +
 17 files changed, 38 insertions(+), 163 deletions(-)

diff --git a/packages/E2ETest/wdio/pages/BasePage.ts b/packages/E2ETest/wdio/pages/BasePage.ts
index 80db3b281e2..55f653607eb 100644
--- a/packages/E2ETest/wdio/pages/BasePage.ts
+++ b/packages/E2ETest/wdio/pages/BasePage.ts
@@ -21,18 +21,18 @@ export function wait(timeout: number) {
 }
 
 export class BasePage {
-  isPageLoaded(): boolean {
-    return this.homeButton.isDisplayed();
+  isElementLoaded(element: string): boolean {
+    return By(element).isDisplayed();
   }
 
-  waitForPageLoaded(timeout?: number) {
+  waitForElementLoaded(element: string, timeout?: number) {
     // eslint-disable-next-line no-undef
     browser.waitUntil(
       () => {
-        return this.isPagedLoadedOrLoadBundleError();
+        return this.isElementLoadedOrLoadBundleError(element);
       },
       this.timeoutForPageLoaded(timeout),
-      'Wait for page ' + this.constructor.name + ' timeout'
+      'Wait for element ' + element + ' timeout'
     );
   }
 
@@ -73,12 +73,12 @@ export class BasePage {
     return By(REACT_CONTROL_ERROR_TEST_ID);
   }
 
-  private isPagedLoadedOrLoadBundleError(): boolean {
+  private isElementLoadedOrLoadBundleError(element: string): boolean {
     if (this.reactControlErrorMessage.isDisplayed()) {
       throw "ReactControl doesn't load bundle successfully: " +
         this.reactControlErrorMessage.getText();
     }
-    return this.isPageLoaded();
+    return this.isElementLoaded(element);
   }
 
   private get treeDumpResult() {
diff --git a/packages/E2ETest/wdio/pages/ControlStylePage.ts b/packages/E2ETest/wdio/pages/ControlStylePage.ts
index 1d95975d583..ab0995d90a2 100644
--- a/packages/E2ETest/wdio/pages/ControlStylePage.ts
+++ b/packages/E2ETest/wdio/pages/ControlStylePage.ts
@@ -7,15 +7,6 @@ import { BasePage, By } from './BasePage';
 import { SHOWBORDER_ON_CONTROLSTYLE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 class ControlStyleTestPage extends BasePage {
-  backToHomePage() {
-    this.homeButton.click();
-    this.waitForPageLoaded();
-  }
-
-  isPageLoaded() {
-    return super.isPageLoaded();
-  }
-
   toggleControlBorder() {
     this._controlBorder.click();
   }
diff --git a/packages/E2ETest/wdio/pages/DirectManipulationPage.ts b/packages/E2ETest/wdio/pages/DirectManipulationPage.ts
index 58191f3ba4b..986910e43b6 100644
--- a/packages/E2ETest/wdio/pages/DirectManipulationPage.ts
+++ b/packages/E2ETest/wdio/pages/DirectManipulationPage.ts
@@ -11,15 +11,6 @@ import {
 } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 class DirectManipulationPage extends BasePage {
-  backToHomePage() {
-    this.homeButton.click();
-    this.waitForPageLoaded();
-  }
-
-  isPageLoaded() {
-    return super.isPageLoaded() && this.measureInWindowButton.isDisplayed();
-  }
-
   clickMeasureInWindowAndGetResult() {
     this.measureInWindowButton.click();
     return this.directManipulationResult.getText();
diff --git a/packages/E2ETest/wdio/pages/HomePage.ts b/packages/E2ETest/wdio/pages/HomePage.ts
index da11b578c39..b9629d291e8 100644
--- a/packages/E2ETest/wdio/pages/HomePage.ts
+++ b/packages/E2ETest/wdio/pages/HomePage.ts
@@ -4,86 +4,24 @@
  */
 
 import { BasePage, By } from './BasePage';
-import TextInputTestPage from './TextInputTestPage';
 import {
-  TEXTINPUT_TESTPAGE,
-  LOGIN_TESTPAGE,
-  DIRECT_MANIPULATION_TESTPAGE,
-  IMAGE_TESTPAGE,
-  CONTROL_STYLE_TESTPAGE,
-  TRANSFORM_TESTPAGE,
+  SEARCH_BOX,
+  BACK_BUTTON,
 } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
-import LoginPage from './LoginPage';
-import DirectManipulationPage from './DirectManipulationPage';
-import ImageTestPage from './ImageTestPage';
-import ControlStyleTestPage from './ControlStylePage';
 
 class HomePage extends BasePage {
-  backToHomePage() {
-    this.homeButton.click();
-    this.waitForPageLoaded();
-  }
-
-  isPageLoaded() {
-    return super.isPageLoaded() && this.testInputTestPageButton.isDisplayed();
-  }
-
-  clickAndGoToTextInputPage() {
-    this.testInputTestPageButton.click();
-    TextInputTestPage.waitForPageLoaded();
-  }
-
-  clickAndGotoLoginPage() {
-    this.loginTestPageButton.click();
-    LoginPage.waitForPageLoaded();
-  }
-
-  clickAndGotoDirectManipulationPage() {
-    this.directManipulationPageButton.click();
-    DirectManipulationPage.waitForPageLoaded();
-  }
-
-  clickAndGotoImagePage() {
-    this.ImagePageButton.click();
-    ImageTestPage.waitForPageLoaded();
-  }
-
-  clickControlStylePageButton() {
-    this.ControlStylePageButton.click();
-  }
-
-  clickAndGotoControlStylePage() {
-    this.ControlStylePageButton.click();
-    ControlStyleTestPage.waitForPageLoaded();
-  }
-
-  clickAndGotoTransformTestPage() {
-    this.TransformTestPageButton.click();
-    ControlStyleTestPage.waitForPageLoaded();
-  }
-
-  private get testInputTestPageButton() {
-    return By(TEXTINPUT_TESTPAGE);
-  }
-
-  private get loginTestPageButton() {
-    return By(LOGIN_TESTPAGE);
+  goToTestPage(page: string) {
+    // Filter the list down to the one test, to improve stability of selectors
+    this.waitForElementLoaded(SEARCH_BOX);
+    let editBox = By(SEARCH_BOX);
+    editBox.setValue(page);
+    let pageItem = By(page);
+    pageItem.click();
+    super.waitForElementLoaded(BACK_BUTTON);
   }
 
-  private get directManipulationPageButton() {
-    return By(DIRECT_MANIPULATION_TESTPAGE);
-  }
-
-  private get ImagePageButton() {
-    return By(IMAGE_TESTPAGE);
-  }
-
-  private get ControlStylePageButton() {
-    return By(CONTROL_STYLE_TESTPAGE);
-  }
-
-  private get TransformTestPageButton() {
-    return By(TRANSFORM_TESTPAGE);
+  backToHomePage() {
+    this.homeButton.click();
   }
 }
 
diff --git a/packages/E2ETest/wdio/pages/ImageTestPage.ts b/packages/E2ETest/wdio/pages/ImageTestPage.ts
index 1a9c92eb9ba..fc4e2ad0d7e 100644
--- a/packages/E2ETest/wdio/pages/ImageTestPage.ts
+++ b/packages/E2ETest/wdio/pages/ImageTestPage.ts
@@ -10,15 +10,6 @@ import {
 } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 class ImageTestPage extends BasePage {
-  backToHomePage() {
-    this.homeButton.click();
-    this.waitForPageLoaded();
-  }
-
-  isPageLoaded() {
-    return super.isPageLoaded();
-  }
-
   toggleImageBorder() {
     this._imageBorder.click();
   }
diff --git a/packages/E2ETest/wdio/pages/LoginPage.ts b/packages/E2ETest/wdio/pages/LoginPage.ts
index 23c883aa31e..39a4721501d 100644
--- a/packages/E2ETest/wdio/pages/LoginPage.ts
+++ b/packages/E2ETest/wdio/pages/LoginPage.ts
@@ -13,10 +13,6 @@ import {
 } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 class LoginPage extends BasePage {
-  isPageLoaded() {
-    return super.isPageLoaded() && this._userName.isDisplayed();
-  }
-
   setLoginInfo(userName: string, password: string) {
     this._userName.setValue(userName);
     this._password.setValue(password);
diff --git a/packages/E2ETest/wdio/pages/TextInputTestPage.ts b/packages/E2ETest/wdio/pages/TextInputTestPage.ts
index ec0b92c6f78..a482598e99b 100644
--- a/packages/E2ETest/wdio/pages/TextInputTestPage.ts
+++ b/packages/E2ETest/wdio/pages/TextInputTestPage.ts
@@ -12,10 +12,6 @@ import {
 } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 class TextInputTestPage extends BasePage {
-  isPageLoaded() {
-    return super.isPageLoaded() && this.textInput.isDisplayed();
-  }
-
   clickTextInput() {
     this.textInput.click();
   }
diff --git a/packages/E2ETest/wdio/pages/TransformTestPage.ts b/packages/E2ETest/wdio/pages/TransformTestPage.ts
index 3e0a3516aff..1043bc31045 100644
--- a/packages/E2ETest/wdio/pages/TransformTestPage.ts
+++ b/packages/E2ETest/wdio/pages/TransformTestPage.ts
@@ -11,15 +11,6 @@ import {
 } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 class DirectManipulationPage extends BasePage {
-  backToHomePage() {
-    this.homeButton.click();
-    this.waitForPageLoaded();
-  }
-
-  isPageLoaded() {
-    return super.isPageLoaded() && this.measureLayoutButton.isDisplayed();
-  }
-
   clickApplyScaleTransform() {
     this.applyScaleTransformButton.click();
   }
diff --git a/packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts b/packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts
index 42bdcae7c7e..ea0afab2b3a 100644
--- a/packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts
+++ b/packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts
@@ -2,7 +2,8 @@
  * Copyright (c) Microsoft Corporation.
  * Licensed under the MIT License.
  */
-import HomePage from '../pages/HomePage';
+import { By } from '../pages/BasePage';
+import { CONTROL_STYLE_TESTPAGE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 describe('SmokeTest', () => {
   it('SmokeTest', () => {
@@ -10,6 +11,6 @@ describe('SmokeTest', () => {
     // to workaround an instability in WinAppDriver (?) on first test launch,
     // which causes the click to not actually work if the control needs to
     // first be scrolled into view.
-    HomePage.clickControlStylePageButton();
+    By(CONTROL_STYLE_TESTPAGE).click();
   });
 });
diff --git a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts
index 9b2743a83c2..e3c832f8cf2 100644
--- a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts
+++ b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts
@@ -6,9 +6,10 @@
 import HomePage from '../pages/HomePage';
 import DirectManipulationPage from '../pages/DirectManipulationPage';
 import assert from 'assert';
+import { DIRECT_MANIPULATION_TESTPAGE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 beforeAll(() => {
-  HomePage.clickAndGotoDirectManipulationPage();
+  HomePage.goToTestPage(DIRECT_MANIPULATION_TESTPAGE);
 });
 
 describe('DirectManipulationTest', () => {
diff --git a/packages/E2ETest/wdio/test/Image.spec.ts b/packages/E2ETest/wdio/test/Image.spec.ts
index cbab8e95e4a..a81c5876835 100644
--- a/packages/E2ETest/wdio/test/Image.spec.ts
+++ b/packages/E2ETest/wdio/test/Image.spec.ts
@@ -6,9 +6,10 @@
 import HomePage from '../pages/HomePage';
 import ImageTestPage from '../pages/ImageTestPage';
 import assert from 'assert';
+import { IMAGE_TESTPAGE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 beforeAll(() => {
-  HomePage.clickAndGotoImagePage();
+  HomePage.goToTestPage(IMAGE_TESTPAGE);
 });
 
 describe('ImageWithoutBorderTest', () => {
diff --git a/packages/E2ETest/wdio/test/TransformTest.spec.ts b/packages/E2ETest/wdio/test/TransformTest.spec.ts
index 07336d90fc5..2d530c59021 100644
--- a/packages/E2ETest/wdio/test/TransformTest.spec.ts
+++ b/packages/E2ETest/wdio/test/TransformTest.spec.ts
@@ -6,9 +6,10 @@
 import HomePage from '../pages/HomePage';
 import TransformTestPage from '../pages/TransformTestPage';
 import assert from 'assert';
+import { TRANSFORM_TESTPAGE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 beforeAll(() => {
-  HomePage.clickAndGotoTransformTestPage();
+  HomePage.goToTestPage(TRANSFORM_TESTPAGE);
 });
 
 describe('TransformTest', () => {
diff --git a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
index 8f0c6b21d0e..43205f0e49c 100644
--- a/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
+++ b/packages/E2ETest/wdio/test/VisitAllPages.spec.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { BasePage, By } from '../pages/BasePage';
+import HomePage from '../pages/HomePage';
 
 let pages = [
   '<ActivityIndicator>',
@@ -69,39 +69,12 @@ let pages = [
   //  '<LegacyAccessibilityTest>',
 ];
 
-class TestPage extends BasePage {
-  goToTestPage(page: string) {
-    // Filter the list down to the one test, to improve stability of selectors
-    this.waitForHomePageLoaded();
-    let editBox = By('explorer_search');
-    editBox.setValue(page);
-    let pageItem = By(page);
-    pageItem.click();
-    this.waitForPageLoaded();
-  }
-  backToHomePage() {
-    this.homeButton.click();
-  }
-
-  waitForHomePageLoaded(timeout?: number) {
-    // eslint-disable-next-line no-undef
-    browser.waitUntil(
-      () => {
-        return By('explorer_search').isDisplayed();
-      },
-      this.timeoutForPageLoaded(timeout),
-      'Wait for HomePage load timed out'
-    );
-  }
-}
-
 describe('VisitAllPagesTest', () => {
   pages.forEach(function(page) {
     it(page, () => {
       console.log('loading page ' + page);
-      let testPage = new TestPage();
-      testPage.goToTestPage(page);
-      testPage.backToHomePage();
+      HomePage.goToTestPage(page);
+      HomePage.backToHomePage();
     });
   });
 });
diff --git a/packages/E2ETest/wdio/test/controlStyle.spec.ts b/packages/E2ETest/wdio/test/controlStyle.spec.ts
index 704875bf028..cd648ffa6be 100644
--- a/packages/E2ETest/wdio/test/controlStyle.spec.ts
+++ b/packages/E2ETest/wdio/test/controlStyle.spec.ts
@@ -6,9 +6,10 @@
 import HomePage from '../pages/HomePage';
 import ControlStyleTestPage from '../pages/ControlStylePage';
 import assert from 'assert';
+import { CONTROL_STYLE_TESTPAGE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 beforeAll(() => {
-  HomePage.clickAndGotoControlStylePage();
+  HomePage.goToTestPage(CONTROL_STYLE_TESTPAGE);
 });
 
 describe('ControlStyleTest', () => {
diff --git a/packages/E2ETest/wdio/test/login.spec.ts b/packages/E2ETest/wdio/test/login.spec.ts
index 854b46d3f1e..e7297f45d25 100644
--- a/packages/E2ETest/wdio/test/login.spec.ts
+++ b/packages/E2ETest/wdio/test/login.spec.ts
@@ -6,9 +6,10 @@
 import LoginPage from '../pages/LoginPage';
 import HomePage from '../pages/HomePage';
 import assert from 'assert';
+import { LOGIN_TESTPAGE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 beforeAll(() => {
-  HomePage.clickAndGotoLoginPage();
+  HomePage.goToTestPage(LOGIN_TESTPAGE);
 });
 
 describe('LoginTest', () => {
diff --git a/packages/E2ETest/wdio/test/testInput.spec.ts b/packages/E2ETest/wdio/test/testInput.spec.ts
index 8c21484ec5b..3a9434bdc53 100644
--- a/packages/E2ETest/wdio/test/testInput.spec.ts
+++ b/packages/E2ETest/wdio/test/testInput.spec.ts
@@ -6,9 +6,10 @@
 import TextInputTestPage from '../pages/TextInputTestPage';
 import HomePage from '../pages/HomePage';
 import assert from 'assert';
+import { TEXTINPUT_TESTPAGE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
 
 beforeAll(() => {
-  HomePage.clickAndGoToTextInputPage();
+  HomePage.goToTestPage(TEXTINPUT_TESTPAGE);
 });
 
 function assertLogContains(text: string) {
diff --git a/vnext/src/RNTester/js/examples-win/LegacyTests/Consts.ts b/vnext/src/RNTester/js/examples-win/LegacyTests/Consts.ts
index 0ef5b78d073..d73e4912736 100644
--- a/vnext/src/RNTester/js/examples-win/LegacyTests/Consts.ts
+++ b/vnext/src/RNTester/js/examples-win/LegacyTests/Consts.ts
@@ -1,4 +1,5 @@
 // Framework
+export const SEARCH_BOX = 'explorer_search';
 export const BACK_BUTTON = 'BackButton';
 export const REACT_CONTROL_ERROR_TEST_ID = 'ReactControlErrorMessage';
 export const TREE_DUMP_RESULT = 'TreeDump';

From 3b2a901ab2858dc27b89284b21305e7212e7ef3d Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Mon, 17 Aug 2020 15:28:29 -0700
Subject: [PATCH 18/20] Change files

---
 ...tive-windows-2020-08-17-15-28-29-VisitAllPagesFix.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 change/react-native-windows-2020-08-17-15-28-29-VisitAllPagesFix.json

diff --git a/change/react-native-windows-2020-08-17-15-28-29-VisitAllPagesFix.json b/change/react-native-windows-2020-08-17-15-28-29-VisitAllPagesFix.json
new file mode 100644
index 00000000000..dc97317ab4b
--- /dev/null
+++ b/change/react-native-windows-2020-08-17-15-28-29-VisitAllPagesFix.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "fix instability in VisitAllPages test",
+  "packageName": "react-native-windows",
+  "email": "kmelmon@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-08-17T22:28:29.230Z"
+}

From abfbdb32b72bd618cf60791bafeeed19dd7a79db Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Mon, 17 Aug 2020 15:39:49 -0700
Subject: [PATCH 19/20] remove smoke test

---
 packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts

diff --git a/packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts b/packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts
deleted file mode 100644
index ea0afab2b3a..00000000000
--- a/packages/E2ETest/wdio/test/AAA_SmokeTest.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- */
-import { By } from '../pages/BasePage';
-import { CONTROL_STYLE_TESTPAGE } from 'react-native-windows/RNTester/js/examples-win/LegacyTests/Consts';
-
-describe('SmokeTest', () => {
-  it('SmokeTest', () => {
-    // Only click the button to try to go to the ControlStyle test page,
-    // to workaround an instability in WinAppDriver (?) on first test launch,
-    // which causes the click to not actually work if the control needs to
-    // first be scrolled into view.
-    By(CONTROL_STYLE_TESTPAGE).click();
-  });
-});

From 47cf2fe0c4666a5a8b15e6c40fe3c6b7694b5f7b Mon Sep 17 00:00:00 2001
From: Keith Melmon <kmelmon@microsoft.com>
Date: Mon, 17 Aug 2020 16:59:10 -0700
Subject: [PATCH 20/20] stability pass after removing smoke test, try #2

---
 packages/E2ETest/wdio/pages/HomePage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/E2ETest/wdio/pages/HomePage.ts b/packages/E2ETest/wdio/pages/HomePage.ts
index b9629d291e8..8894972d5f8 100644
--- a/packages/E2ETest/wdio/pages/HomePage.ts
+++ b/packages/E2ETest/wdio/pages/HomePage.ts
@@ -11,7 +11,7 @@ import {
 
 class HomePage extends BasePage {
   goToTestPage(page: string) {
-    // Filter the list down to the one test, to improve stability of selectors
+    // Filter the list down to the one test, to improve the stability of selectors
     this.waitForElementLoaded(SEARCH_BOX);
     let editBox = By(SEARCH_BOX);
     editBox.setValue(page);