From 01a86e90d509353e72a643dc62b720980aff934e Mon Sep 17 00:00:00 2001 From: Ranjit Date: Thu, 18 Dec 2025 12:06:38 +0530 Subject: [PATCH 1/3] Fix ATH errors with experimental build-with-parameters --- .../jenkinsci/test/acceptance/po/BuildWithParameters.java | 7 ++++++- src/main/java/org/jenkinsci/test/acceptance/po/Job.java | 2 +- .../java/org/jenkinsci/test/acceptance/po/Parameter.java | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/BuildWithParameters.java b/src/main/java/org/jenkinsci/test/acceptance/po/BuildWithParameters.java index 81f07604ac..7b9e5f7bc6 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/BuildWithParameters.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/BuildWithParameters.java @@ -49,6 +49,11 @@ public BuildWithParameters enter(List definitions, Map val } public void start() { - clickButton("Build"); + if (Boolean.getBoolean("new-build-page.flag.defaultValue")) { + find(by.xpath("//dialog[@open]//div[@id='bottom-sticker']//button[contains(., 'Build')]")) + .click(); + } else { + clickButton("Build"); + } } } diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java index a1ead95117..ee26327f17 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java @@ -367,7 +367,7 @@ public Build scheduleBuild(Map params) { // so wait for it to be added and then disappear waitFor(waitFor(By.id("notification-bar"))).until(bar -> !bar.isDisplayed()); } else { - clickLink("Build with Parameters"); + clickButton("Build with Parameters"); try { BuildWithParameters paramsPage = new BuildWithParameters(this, new URL(driver.getCurrentUrl())); paramsPage.enter(parameters, params).start(); diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java b/src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java index 3a516ac4e3..c8a47aeb72 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java @@ -53,6 +53,11 @@ public By path(String rel) { return super.path(rel); } + if (Boolean.getBoolean("new-build-page.flag.defaultValue")) { + return by.xpath( + "//input[@name='name' and @value='%s']/parent::div[@name='parameter']//*[@name='%s']", name, rel); + } + String np = driver.findElement(by.xpath("//input[@name='name' and @value='%s']", name)) .getAttribute("path"); String path = np.replaceAll("/name$", "") + "/" + rel; From 173380be24fc26c63318663caec1f57d931009b2 Mon Sep 17 00:00:00 2001 From: Ranjit Date: Thu, 18 Dec 2025 12:09:47 +0530 Subject: [PATCH 2/3] Add conditional check on clickLink --- src/main/java/org/jenkinsci/test/acceptance/po/Job.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java index ee26327f17..697b9e5ba3 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java @@ -367,7 +367,11 @@ public Build scheduleBuild(Map params) { // so wait for it to be added and then disappear waitFor(waitFor(By.id("notification-bar"))).until(bar -> !bar.isDisplayed()); } else { - clickButton("Build with Parameters"); + if (Boolean.getBoolean("new-build-page.flag.defaultValue")) { + clickButton("Build with Parameters"); + } else { + clickLink("Build with Parameters"); + } try { BuildWithParameters paramsPage = new BuildWithParameters(this, new URL(driver.getCurrentUrl())); paramsPage.enter(parameters, params).start(); From 9cfd73b7ae48ed64679eb653988b5e0154a9c73e Mon Sep 17 00:00:00 2001 From: Ranjit Date: Thu, 18 Dec 2025 12:19:53 +0530 Subject: [PATCH 3/3] Use correct flag --- .../org/jenkinsci/test/acceptance/po/BuildWithParameters.java | 2 +- src/main/java/org/jenkinsci/test/acceptance/po/Job.java | 2 +- src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/BuildWithParameters.java b/src/main/java/org/jenkinsci/test/acceptance/po/BuildWithParameters.java index 7b9e5f7bc6..afe0840b2b 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/BuildWithParameters.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/BuildWithParameters.java @@ -49,7 +49,7 @@ public BuildWithParameters enter(List definitions, Map val } public void start() { - if (Boolean.getBoolean("new-build-page.flag.defaultValue")) { + if (Boolean.getBoolean("new-job-page.flag.defaultValue")) { find(by.xpath("//dialog[@open]//div[@id='bottom-sticker']//button[contains(., 'Build')]")) .click(); } else { diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java index 697b9e5ba3..f5a7cb4d3e 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java @@ -367,7 +367,7 @@ public Build scheduleBuild(Map params) { // so wait for it to be added and then disappear waitFor(waitFor(By.id("notification-bar"))).until(bar -> !bar.isDisplayed()); } else { - if (Boolean.getBoolean("new-build-page.flag.defaultValue")) { + if (Boolean.getBoolean("new-job-page.flag.defaultValue")) { clickButton("Build with Parameters"); } else { clickLink("Build with Parameters"); diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java b/src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java index c8a47aeb72..7b14f2da49 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/Parameter.java @@ -53,7 +53,7 @@ public By path(String rel) { return super.path(rel); } - if (Boolean.getBoolean("new-build-page.flag.defaultValue")) { + if (Boolean.getBoolean("new-job-page.flag.defaultValue")) { return by.xpath( "//input[@name='name' and @value='%s']/parent::div[@name='parameter']//*[@name='%s']", name, rel); }