From 70144d211900ef7631782e97daed679217103634 Mon Sep 17 00:00:00 2001 From: Patrick Seidensal Date: Tue, 27 Aug 2019 16:07:48 +0200 Subject: [PATCH] mgr/dashboard: fix protractor.conf.js Signed-off-by: Patrick Seidensal --- .../mgr/dashboard/frontend/protractor.conf.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/protractor.conf.js b/src/pybind/mgr/dashboard/frontend/protractor.conf.js index 02d60e4e45719..bcdc1b235d22c 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); }); }; -- 2.39.5