From 4a39250d68c951a023d61e137ba634184953d913 Mon Sep 17 00:00:00 2001 From: labkey-sweta Date: Mon, 4 Dec 2023 14:12:43 -0800 Subject: [PATCH 1/2] Automation test for Update TOTPAuthenticationTest to expect disabled configuration. --- src/org/labkey/test/components/react/MultiMenu.java | 5 +++++ .../labkey/test/pages/core/login/LoginConfigurePage.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/org/labkey/test/components/react/MultiMenu.java b/src/org/labkey/test/components/react/MultiMenu.java index ae42d5c63c..f0b3808ee4 100644 --- a/src/org/labkey/test/components/react/MultiMenu.java +++ b/src/org/labkey/test/components/react/MultiMenu.java @@ -255,6 +255,11 @@ public MultiMenuFinder withButtonIcon(String iconClass) return this; } + public boolean isOptionEnabled(String option) + { + return construct(find().getComponentElement(), getDriver()).isMenuItemDisabled(option); + } + @Override protected MultiMenuFinder getThis() { diff --git a/src/org/labkey/test/pages/core/login/LoginConfigurePage.java b/src/org/labkey/test/pages/core/login/LoginConfigurePage.java index ae8dbc9586..e63706d102 100644 --- a/src/org/labkey/test/pages/core/login/LoginConfigurePage.java +++ b/src/org/labkey/test/pages/core/login/LoginConfigurePage.java @@ -71,6 +71,12 @@ public boolean canAddSecondaryConfiguration() return elementCache().secondaryMenuFinder.findOptional(getDriver()).isPresent(); } + public boolean isSecondaryConfOptionEnabled(String option) + { + toggleSecondaryConfiguration(); + return elementCache().secondaryMenuFinder.isOptionEnabled("option"); + } + private boolean isPrimarySelected() { return elementCache().panelTab1.getAttribute("aria-selected").equals("true"); From 939f83d84d6d3b086836a7d4824884bf587e67b0 Mon Sep 17 00:00:00 2001 From: labkey-sweta Date: Mon, 4 Dec 2023 14:44:11 -0800 Subject: [PATCH 2/2] Test update --- src/org/labkey/test/components/react/MultiMenu.java | 6 ------ .../labkey/test/pages/core/login/LoginConfigurePage.java | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/org/labkey/test/components/react/MultiMenu.java b/src/org/labkey/test/components/react/MultiMenu.java index f0b3808ee4..fab4d88f9c 100644 --- a/src/org/labkey/test/components/react/MultiMenu.java +++ b/src/org/labkey/test/components/react/MultiMenu.java @@ -254,12 +254,6 @@ public MultiMenuFinder withButtonIcon(String iconClass) _locator = Locators.menuContainer().withChild(BootstrapMenu.Locators.dropdownToggle().withChild(Locator.byClass(iconClass))); return this; } - - public boolean isOptionEnabled(String option) - { - return construct(find().getComponentElement(), getDriver()).isMenuItemDisabled(option); - } - @Override protected MultiMenuFinder getThis() { diff --git a/src/org/labkey/test/pages/core/login/LoginConfigurePage.java b/src/org/labkey/test/pages/core/login/LoginConfigurePage.java index e63706d102..5dadb41880 100644 --- a/src/org/labkey/test/pages/core/login/LoginConfigurePage.java +++ b/src/org/labkey/test/pages/core/login/LoginConfigurePage.java @@ -74,7 +74,7 @@ public boolean canAddSecondaryConfiguration() public boolean isSecondaryConfOptionEnabled(String option) { toggleSecondaryConfiguration(); - return elementCache().secondaryMenuFinder.isOptionEnabled("option"); + return !elementCache().addSecondaryMenu.isMenuItemDisabled(option); } private boolean isPrimarySelected() @@ -203,7 +203,7 @@ protected class ElementCache extends LabKeyPage.ElementCache BootstrapMenu addPrimaryMenu = primaryMenuFinder.findWhenNeeded(this); MultiMenu.MultiMenuFinder secondaryMenuFinder = new MultiMenu.MultiMenuFinder(getDriver()) .withText("Add New Secondary Configuration").timeout(WAIT_FOR_JAVASCRIPT); - BootstrapMenu addSecondaryMenu = secondaryMenuFinder.findWhenNeeded(this); + MultiMenu addSecondaryMenu = secondaryMenuFinder.findWhenNeeded(this); WebElement globalSettingsPanel() {