From 863e632fa53126bedc1c734b72175f53d005d593 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 27 Aug 2024 07:35:50 -0700 Subject: [PATCH] Remove more dead code --- .../org/jenkinsci/test/acceptance/po/PluginManager.java | 7 +------ src/test/java/plugins/JobDslPluginTest.java | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) 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 fbdefd57dc..69ba4fba8c 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java @@ -250,12 +250,7 @@ public boolean installPlugins(final PluginSpec... specs) throws UnableToResolveD tickPluginToInstall(n); } - // Temporary until https://github.com/jenkinsci/jenkins/pull/8025 is in LTS - if (find(by.button("Download now and install after restart")) != null) { - control(by.button("Download now and install after restart")).clickAndWaitToBecomeStale(); - } else { - control(by.button("Update")).clickAndWaitToBecomeStale(); - } + control(by.button("Update")).clickAndWaitToBecomeStale(); } } diff --git a/src/test/java/plugins/JobDslPluginTest.java b/src/test/java/plugins/JobDslPluginTest.java index 3133b6d0a9..b07134622b 100644 --- a/src/test/java/plugins/JobDslPluginTest.java +++ b/src/test/java/plugins/JobDslPluginTest.java @@ -916,13 +916,8 @@ public void are_columns_created() { assertThat(view, containsColumnHeader("Last Duration")); String searchText = "Schedule a Build for " + job1.name; - // behaviour change in https://github.com/jenkinsci/jenkins/pull/6084 WebElement webElement = view.getElement(By.cssSelector(String.format("a[tooltip='%s']", searchText))); - if (webElement != null) { - assertThat(view, containsLinkWithTooltip(searchText)); - } else { - assertThat(view, containsSvgWithText(searchText)); - } + assertThat(view, containsLinkWithTooltip(searchText)); } /**