re-work change to not break jest test

elastic · Feb 12, 2020 · 1498c2d · 1498c2d
1 parent 33a2a8b
commit 1498c2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/test/functional/apps/home/_sample_data.ts b/test/functional/apps/home/_sample_data.ts
@@ -84,7 +84,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should launch sample flights data set dashboard', async () => {
-        await PageObjects.home.launchSampleDataSet('flights');
+        await PageObjects.home.launchSampleDashboard('flights');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
         const todayYearMonthDay = moment().format('MMM D, YYYY');
@@ -96,7 +96,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should render visualizations', async () => {
-        await PageObjects.home.launchSampleDataSet('flights');
+        await PageObjects.home.launchSampleDashboard('flights');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
         log.debug('Checking pie charts rendered');
@@ -115,7 +115,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should launch sample logs data set dashboard', async () => {
-        await PageObjects.home.launchSampleDataSet('logs');
+        await PageObjects.home.launchSampleDashboard('logs');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
         const todayYearMonthDay = moment().format('MMM D, YYYY');
@@ -127,7 +127,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should launch sample ecommerce data set dashboard', async () => {
-        await PageObjects.home.launchSampleDataSet('ecommerce');
+        await PageObjects.home.launchSampleDashboard('ecommerce');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
         const todayYearMonthDay = moment().format('MMM D, YYYY');

diff --git a/test/functional/page_objects/home_page.ts b/test/functional/page_objects/home_page.ts
@@ -66,20 +66,19 @@ export function HomePageProvider({ getService, getPageObjects }: FtrProviderCont
       });
     }
 
-    async launchSampleDataSet(id: string) {
-      await this.addSampleDataSet(id);
-      await testSubjects.click(`launchSampleDataSet${id}`);
-      // On OSS there's currently only sample dashboards so the launch button opens the dashboard
-      // but on default dist there's more items. The only tests that are calling this method are in OSS
-      // so they always expect Dashboard.  isOss isn't really the right test. It should be based on
-      // the number of items.
-      // x-pack sample data tests seem to skip this navigation and open the saved objects directly.
+    async launchSampleDashboard(id: string) {
+      await this.launchSampleDataSet(id);
       isOss = await PageObjects.common.isOss();
       if (!isOss) {
         await find.clickByLinkText('Dashboard');
       }
     }
 
+    async launchSampleDataSet(id: string) {
+      await this.addSampleDataSet(id);
+      await testSubjects.click(`launchSampleDataSet${id}`);
+    }
+
     async loadSavedObjects() {
       await retry.try(async () => {
         await testSubjects.click('loadSavedObjects');