Remove more dead code

basil · Aug 27, 2024 · 863e632 · 863e632
1 parent 96378c1
commit 863e632
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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));
     }
 
     /**