From 7fdb589133de09e77d29397ee01bcc9004e25cb2 Mon Sep 17 00:00:00 2001
From: tfennelly <tom.fennelly@gmail.com>
Date: Wed, 18 Nov 2015 11:36:30 +0000
Subject: [PATCH] Handle YUI submit <button> clicks

---
 .../htmlunit/html/HtmlElementUtil.java            | 15 +++++++++++++++
 .../java/org/jvnet/hudson/test/JenkinsRule.java   | 10 +++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/test/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElementUtil.java b/test/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElementUtil.java
index c8d599b11f..23372d6740 100644
--- a/test/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElementUtil.java
+++ b/test/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElementUtil.java
@@ -28,6 +28,9 @@ import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebClientUtil;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * {@link HtmlElement} helper methods.
@@ -58,4 +61,16 @@ public class HtmlElementUtil {
             WebClientUtil.waitForJSExec(webClient);
         }
     }
+
+    /**
+     * Does the supplied element define the specified HTML "class" name.
+     * @param element The element to check.
+     * @param className The HTML "class" name to check for.
+     * @return {@code true} if the element defines the specified class, otherwise {@code false}.
+     */
+    public static boolean hasClassName(HtmlElement element, String className) {
+        String classAttribute = element.getAttribute("class");
+        Set<String> classes = new HashSet<>(Arrays.asList(classAttribute.split(" ")));
+        return classes.contains(className);
+    }
 }
diff --git a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
index c58951f490..394555c489 100644
--- a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
+++ b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
@@ -37,6 +37,7 @@ import com.gargoylesoftware.htmlunit.WebResponseListener;
 import com.gargoylesoftware.htmlunit.html.DomNode;
 import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlImage;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
@@ -1341,9 +1342,12 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction {
      */
     public HtmlPage submit(HtmlForm form, String name) throws Exception {
         for( HtmlElement e : form.getHtmlElementsByTagName("button")) {
-            HtmlElement p = (HtmlElement)e.getParentNode().getParentNode();
-            if(e instanceof HtmlButton && p.getAttribute("name").equals(name)) {
-                return (HtmlPage)HtmlFormUtil.submit(form, (HtmlButton) e);
+            HtmlElement p = (HtmlElement)e.getParentNode().getParentNode();                        
+            if (p.getAttribute("name").equals(name) && HtmlElementUtil.hasClassName(p, "yui-submit-button")) {
+                // For YUI handled submit buttons, just do a click.
+                return (HtmlPage) HtmlElementUtil.click(e);
+            } else if (e.getAttribute("name").equals(name)) {
+                return (HtmlPage) HtmlFormUtil.submit(form, e);
             }
         }
         throw new AssertionError("No such submit button with the name "+name);
-- 
GitLab