From: Patrick Seidensal <pseidensal@suse.com>
Date: Tue, 27 Aug 2019 14:07:48 +0000 (+0200)
Subject: mgr/dashboard: fix protractor.conf.js
X-Git-Tag: v15.1.0~1745^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29758%2Fhead;p=ceph.git

mgr/dashboard: fix protractor.conf.js

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/protractor.conf.js b/src/pybind/mgr/dashboard/frontend/protractor.conf.js
index 02d60e4e4571..bcdc1b235d22 100644
--- a/src/pybind/mgr/dashboard/frontend/protractor.conf.js
+++ b/src/pybind/mgr/dashboard/frontend/protractor.conf.js
@@ -44,7 +44,7 @@ const config = {
 };
 
 config.onPrepare = async () => {
-  browser.manage().timeouts().implicitlyWait(config.implicitWaitTimeout)
+  await browser.manage().timeouts().implicitlyWait(config.implicitWaitTimeout);
 
   require('ts-node').register({
     project: 'e2e/tsconfig.e2e.json'
@@ -60,15 +60,12 @@ config.onPrepare = async () => {
 
   await browser.driver.findElement(by.css('input[type="submit"]')).click();
 
-  global.browser.getProcessedConfig().then(async (config) => {
-    // Login takes some time, so wait until it's done.
-    // For the test app's login, we know it's done when it redirects to
-    // dashboard.
-    return await browser.driver.wait(async () => {
-      return await browser.driver.getCurrentUrl().then((url) => {
-        return /dashboard/.test(url);
-      });
-    });
+  // Login takes some time, so wait until it's done.
+  // For the test app's login, we know it's done when it redirects to
+  // dashboard.
+  await browser.driver.wait(async () => {
+    const url = await browser.driver.getCurrentUrl();
+    return /dashboard/.test(url);
   });
 };