Forward compatibility for use Jenkins modal for 'Apply' button failur…

…es (#1446)
jenkinsci · Dec 17, 2023 · 81b784f · 81b784f
1 parent 39f10d9
commit 81b784f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/test/java/core/FreestyleJobTest.java b/src/test/java/core/FreestyleJobTest.java
@@ -308,15 +308,24 @@ public void showErrorSavingConfig() {
         By error = by.css(errorElementCSS);
 
         assertThat(waitFor(error).getText(), containsString("Invalid input: \"not_a_time\""));
-        clickLink("Close");
+        closeDialog();
 
         j.configure();
         j.addTrigger(TimerTrigger.class);
         trigger.spec.set("not_a_time_either");
         clickButton("Apply");
 
         assertThat(waitFor(error).getText(), containsString("Invalid input: \"not_a_time_either\""));
-        clickLink("Close");
+        closeDialog();
+    }
+
+    private void closeDialog() {
+        try {
+            clickButton("Close");
+        } catch (NoSuchElementException x) {
+            // before https://github.com/jenkinsci/jenkins/pull/8394
+            clickLink("Close");
+        }
     }
 
     @Test

diff --git a/src/test/java/plugins/ScriptSecurityPluginTest.java b/src/test/java/plugins/ScriptSecurityPluginTest.java
@@ -116,6 +116,7 @@ public void scriptNeedsApproval() throws Exception {
 
     @Test
     @WithPlugins("groovy-postbuild")
+    @Ignore("https://github.com/jenkinsci/acceptance-test-harness/issues/1444")
     public void signatureNeedsApproval() throws Exception {
         final FreeStyleJob job = createFailedJobWithGroovyPostBuild("def h = java.lang.System.getProperties()", true);
         login(ADMIN);