From 5bfe603c573d9bb31bd4bd59f10687434adc2817 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:08:42 +0100 Subject: [PATCH] Plugin manager app bar forward compatibility (#1230) Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Co-authored-by: Alexander Brandes --- pom.xml | 1 - .../org/jenkinsci/test/acceptance/po/PluginManager.java | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 90b1e128e0..9293f67cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ 999999-SNAPSHOT true - 2.412 4.10.0 32.0.0-jre diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java index 8d827008fd..0119cf2d98 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java @@ -244,7 +244,13 @@ public boolean installPlugins(final PluginSpec... specs) throws UnableToResolveD for (PluginSpec n : update) { tickPluginToInstall(n); } - clickButton("Download now and install after restart"); + + // Temporary until https://github.com/jenkinsci/jenkins/pull/8025 is in LTS + if (find(by.button("Download now and install after restart")) != null) { + clickButton("Download now and install after restart"); + } else { + clickButton("Update"); + } } }