From 829af789462253b40b873587d521fde0a4705c69 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 10 Dec 2024 21:55:15 +0000 Subject: [PATCH 1/5] Test yui disabled --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb1fb0400..7ab15bc37 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 999999-SNAPSHOT true - 2.488 + 2.490-rc35689.445736fce157 4.27.0 33.3.1-jre From 9a70e52e52e53f9c8302f3896ae7e152fd8405bd Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 10 Dec 2024 21:55:50 +0000 Subject: [PATCH 2/5] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e68dfffc5..d99cfd147 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ if (needSplittingFromWorkspace) { } def axes = [ - jenkinsVersions: ['lts', 'latest'], + jenkinsVersions: ['latest'], platforms: ['linux'], jdks: [17, 21], browsers: ['firefox'], From 113b1eec55d2369d6428dc004e5ecfe69c176ea5 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 10 Dec 2024 22:31:26 +0000 Subject: [PATCH 3/5] Remove unneeded yui code --- .../jenkinsci/test/acceptance/po/Control.java | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Control.java b/src/main/java/org/jenkinsci/test/acceptance/po/Control.java index a85c22f54..28e218033 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/Control.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/Control.java @@ -215,25 +215,8 @@ public void selectDropdownMenu(String displayName) { @Override protected WebElement find(String caption) { WebElement menuButton = resolve(); - try { - WebElement menu = findElement(menuButton, by.xpath("..")); - return findElement(menu, by.button(caption)); - } catch (NoSuchElementException e) { - // With enough implementations registered the one we are looking for might - // require scrolling in menu to become visible. This dirty hack stretch - // yui menu so that all the items are visible. - executeScript("YAHOO.util.Dom.batch(" - + " document.querySelector('.yui-menu-body-scrolled')," - + " function (el) {" - + " el.style.height = 'auto';" - + " YAHOO.util.Dom.removeClass(el, 'yui-menu-body-scrolled');" - + " }" - + ");"); - // we can not use `Select` as these are YUI menus and we need to wait for it to be visible - WebElement menu = - findElement(menuButton, by.xpath("ancestor::*[contains(@class,'yui-menu-button')]/..")); - return findElement(menu, by.link(caption)); - } + WebElement menu = findElement(menuButton, by.xpath("..")); + return findElement(menu, by.button(caption)); } }; @@ -250,17 +233,6 @@ public void selectDropdownMenuAlt(Class type) { protected WebElement find(String caption) { WebElement menuButton = resolve(); - // With enough implementations registered the one we are looking for might - // require scrolling in menu to become visible. This dirty hack stretch - // yui menu so that all the items are visible. - executeScript("YAHOO.util.Dom.batch(" - + " document.querySelector('.yui-menu-body-scrolled')," - + " function (el) {" - + " el.style.height = 'auto';" - + " YAHOO.util.Dom.removeClass(el, 'yui-menu-body-scrolled');" - + " }" - + ");"); - Select context = new Select(findElement( menuButton, by.xpath("ancestor-or-self::*[contains(@class,'setting-input dropdownList')] | " From c2f70caef2ff00febf446970d9be07451632ee7e Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:29:13 +0000 Subject: [PATCH 4/5] Discard changes to Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d99cfd147..e68dfffc5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ if (needSplittingFromWorkspace) { } def axes = [ - jenkinsVersions: ['latest'], + jenkinsVersions: ['lts', 'latest'], platforms: ['linux'], jdks: [17, 21], browsers: ['firefox'], From 08c7a6f9a4536e0c235e445e2304e01cfd827a82 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:29:20 +0000 Subject: [PATCH 5/5] Discard changes to pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ab15bc37..bb1fb0400 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 999999-SNAPSHOT true - 2.490-rc35689.445736fce157 + 2.488 4.27.0 33.3.1-jre