[dotnet] update implementation for submitting forms

SeleniumHQ · May 25, 2022 · 495c3db · 495c3db
1 parent db61990
commit 495c3db
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/dotnet/src/webdriver/WebElement.cs b/dotnet/src/webdriver/WebElement.cs
@@ -633,11 +633,17 @@ public virtual void Submit()
             }
             else
             {
-                IWebElement form = this.FindElement(By.XPath("./ancestor-or-self::form"));
-                this.driver.ExecuteScript(
-                    "var e = arguments[0].ownerDocument.createEvent('Event');" +
-                    "e.initEvent('submit', true, true);" +
-                    "if (arguments[0].dispatchEvent(e)) { arguments[0].submit(); }", form);
+                String script = "var form = arguments[0];\n" +
+                                "while (form.nodeName != \"FORM\" && form.parentNode) {\n" +
+                                "  form = form.parentNode;\n" +
+                                "}\n" +
+                                "if (!form) { throw Error('Unable to find containing form element'); }\n" +
+                                "if (!form.ownerDocument) { throw Error('Unable to find owning document'); }\n" +
+                                "var e = form.ownerDocument.createEvent('Event');\n" +
+                                "e.initEvent('submit', true, true);\n" +
+                                "if (form.dispatchEvent(e)) { HTMLFormElement.prototype.submit.call(form) }\n";
+
+                this.driver.ExecuteScript(script, this);
             }
         }
 

diff --git a/dotnet/test/common/FormHandlingTests.cs b/dotnet/test/common/FormHandlingTests.cs
@@ -60,10 +60,28 @@ public void ShouldSubmitAFormWhenAnyElementWithinThatFormIsSubmitted()
         }
 
         [Test]
-        public void ShouldNotBeAbleToSubmitAFormThatDoesNotExist()
+        public void ShouldSubmitAFormWithIdSubmit()
         {
             driver.Url = formsPage;
-            Assert.That(() => driver.FindElement(By.Name("SearchableText")).Submit(), Throws.InstanceOf<NoSuchElementException>());
+            driver.FindElement(By.Id("submit")).Submit();
+            WaitFor(TitleToBe("We Arrive Here"), "Browser title is not 'We Arrive Here'");
+            Assert.AreEqual(driver.Title, "We Arrive Here");
+        }
+
+        [Test]
+        public void ShouldSubmitAFormWithNameSubmit()
+        {
+            driver.Url = formsPage;
+            driver.FindElement(By.Name("submit")).Submit();
+            WaitFor(TitleToBe("We Arrive Here"), "Browser title is not 'We Arrive Here'");
+            Assert.AreEqual(driver.Title, "We Arrive Here");
+        }
+
+        [Test]
+        public void ShouldNotBeAbleToSubmitAnInputOutsideAForm()
+        {
+            driver.Url = formsPage;
+            Assert.That(() => driver.FindElement(By.Name("SearchableText")).Submit(), Throws.InstanceOf<WebDriverException>());
         }
 
         [Test]