[functional_test_runner] Fix return statements in async funcs

elastic · Apr 6, 2017 · 73326bf · 73326bf
1 parent ba202b4
commit 73326bf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/src/functional_test_runner/cli.js b/src/functional_test_runner/cli.js
@@ -27,7 +27,7 @@ if (!cmd.config) {
   process.exit(1);
 }
 
-let logLevel = 'info';
+let logLevel = 'debug';
 if (cmd.silent) logLevel = 'silent';
 if (cmd.quiet) logLevel = 'error';
 if (cmd.debug) logLevel = 'debug';

diff --git a/test/functional/apps/dashboard/_dashboard.js b/test/functional/apps/dashboard/_dashboard.js
@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('should be able to add visualizations to dashboard', async function addVisualizations() {
-      PageObjects.common.saveScreenshot('Dashboard-no-visualizations');
+      await PageObjects.common.saveScreenshot('Dashboard-no-visualizations');
 
       // This flip between apps fixes the url so state is preserved when switching apps in test mode.
       // Without this flip the url in test mode looks something like
@@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.dashboard.addVisualizations(PageObjects.dashboard.getTestVisualizationNames());
 
       log.debug('done adding visualizations');
-      PageObjects.common.saveScreenshot('Dashboard-add-visualizations');
+      await PageObjects.common.saveScreenshot('Dashboard-add-visualizations');
     });
 
     it('set the timepicker time to that which contains our test data', async function setTimepicker() {

diff --git a/test/functional/page_objects/dashboard_page.js b/test/functional/page_objects/dashboard_page.js
@@ -44,7 +44,7 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
 
     async clickDashboardBreadcrumbLink() {
       log.debug('clickDashboardBreadcrumbLink');
-      return retry.try(() => PageObjects.common.findByCssSelector('a[href="#/dashboard"]').click());
+      await retry.try(() => getRemote().findByCssSelector('a[href="#/dashboard"]').click());
     }
 
     async gotoDashboardLandingPage() {
@@ -60,7 +60,7 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
 
     async getQuery() {
       const queryObject = await testSubjects.find('dashboardQuery');
-      return queryObject.getProperty('value');
+      return await queryObject.getProperty('value');
     }
 
     appendQuery(query) {
@@ -382,7 +382,7 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
     }
 
     async getFilters(timeout = defaultFindTimeout) {
-      return find.allByCssSelector('.filter-bar > .filter', timeout);
+      return await find.allByCssSelector('.filter-bar > .filter', timeout);
     }
 
     async getFilterDescriptions(timeout = defaultFindTimeout) {

diff --git a/test/functional/page_objects/header_page.js b/test/functional/page_objects/header_page.js
@@ -50,14 +50,17 @@ export function HeaderPageProvider({ getService, getPageObjects }) {
 
     async isTimepickerOpen() {
       remote.setFindTimeout(2000);
-      await remote.findDisplayedByCssSelector('.kbn-timepicker')
-      .then(() => true)
-      .catch(() => false);
+      try {
+        await remote.findDisplayedByCssSelector('.kbn-timepicker');
+        return true;
+      } catch (error) {
+        return false;
+      }
     }
 
     async isAbsoluteSectionShowing() {
       log.debug('isAbsoluteSectionShowing');
-      await PageObjects.common.doesCssSelectorExist('input[ng-model=\'absolute.from\']');
+      return await PageObjects.common.doesCssSelectorExist('input[ng-model=\'absolute.from\']');
     }
 
     async showAbsoluteSection() {
@@ -76,22 +79,22 @@ export function HeaderPageProvider({ getService, getPageObjects }) {
 
     async getFromTime() {
       log.debug('getFromTime');
-      await retry.try(async () => {
+      return await retry.try(async () => {
         await this.ensureTimePickerIsOpen();
         await this.showAbsoluteSection();
         remote.setFindTimeout(defaultFindTimeout);
-        await remote.findByCssSelector('input[ng-model=\'absolute.from\']')
+        return await remote.findByCssSelector('input[ng-model=\'absolute.from\']')
         .getProperty('value');
       });
     }
 
     async getToTime() {
       log.debug('getToTime');
-      await retry.try(async () => {
+      return await retry.try(async () => {
         await this.ensureTimePickerIsOpen();
         await this.showAbsoluteSection();
         remote.setFindTimeout(defaultFindTimeout);
-        await remote.findByCssSelector('input[ng-model=\'absolute.to\']')
+        return await remote.findByCssSelector('input[ng-model=\'absolute.to\']')
         .getProperty('value');
       });
     }
@@ -161,7 +164,7 @@ export function HeaderPageProvider({ getService, getPageObjects }) {
 
     async getToastMessage() {
       remote.setFindTimeout(defaultFindTimeout);
-      await remote.findDisplayedByCssSelector('kbn-truncated.toast-message.ng-isolate-scope')
+      return await remote.findDisplayedByCssSelector('kbn-truncated.toast-message.ng-isolate-scope')
       .getVisibleText();
     }
 
@@ -193,24 +196,24 @@ export function HeaderPageProvider({ getService, getPageObjects }) {
     }
 
     async isGlobalLoadingIndicatorVisible() {
-      await testSubjects.find('globalLoadingIndicator', defaultFindTimeout / 5);
+      return await testSubjects.find('globalLoadingIndicator', defaultFindTimeout / 5);
     }
 
     async isGlobalLoadingIndicatorHidden() {
       remote.setFindTimeout(defaultFindTimeout * 10);
-      await remote.findByCssSelector('[data-test-subj="globalLoadingIndicator"].ng-hide');
+      return await remote.findByCssSelector('[data-test-subj="globalLoadingIndicator"].ng-hide');
     }
 
     async getPrettyDuration() {
-      await testSubjects.find('globalTimepickerRange').getVisibleText();
+      return await testSubjects.find('globalTimepickerRange').getVisibleText();
     }
 
     async isSharedTimefilterEnabled() {
       const element = await remote
       .setFindTimeout(defaultFindTimeout)
       .findByCssSelector(`[shared-timefilter=true]`);
 
-      return new Boolean(element);
+      return !!element;
     }
   }