From 982da4cff9f1ff2c808054a090cc33b80ce2ed56 Mon Sep 17 00:00:00 2001 From: Patrick Seidensal Date: Tue, 27 Aug 2019 15:29:15 +0200 Subject: [PATCH] mgr/dashboard: fix issue in dashbboard test Signed-off-by: Patrick Seidensal --- .../mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts | 2 +- .../mgr/dashboard/frontend/e2e/page-helper.po.ts | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts index ba302347765..a5908163465 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts @@ -133,7 +133,7 @@ describe('Dashboard Main Page', () => { const tableCount = await spec.pageObject.getTableTotalCount(); await expect(dashCount).toBe( tableCount, - `Text of card ${spec.cardName} and regex ${spec.regexMatcher} resulted in ${dashCount} ` + + `Text of card "${spec.cardName}" and regex "${spec.regexMatcher}" resulted in ${dashCount} ` + `but did not match table count ${tableCount}` ); } diff --git a/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts index 0b89f49ae31..70b34fbc664 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts @@ -89,12 +89,11 @@ export abstract class PageHelper { } async getTableTotalCount(): Promise { - return Number( - (await $$('.datatable-footer-inner .page-count span') - .filter(async (e) => (await e.getText()).includes('total')) - .first() - .getText()).match(/.*(\d+\s+)total.*/)[1] - ); + const text = await $$('.datatable-footer-inner .page-count span') + .filter(async (e) => (await e.getText()).includes('total')) + .first() + .getText(); + return Number(text.match(/(\d+)\s+total/)[1]); } getTableCell(content: string): ElementFinder { -- 2.39.5