[dotnet] update implementation for submitting forms

titusfortner · titusfortner · commit 495c3dbbcf0c · 2022-05-24T21:44:47.000-05:00
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]

Original file line number	Diff line number	Diff line change
`@@ -633,11 +633,17 @@ public virtual void Submit()`
`633`	`633`	`}`
`634`	`634`	`else`
`635`	`635`	`{`
`636`		`- IWebElement form = this.FindElement(By.XPath("./ancestor-or-self::form"));`
`637`		`- this.driver.ExecuteScript(`
`638`		`- "var e = arguments[0].ownerDocument.createEvent('Event');" +`
`639`		`- "e.initEvent('submit', true, true);" +`
`640`		`- "if (arguments[0].dispatchEvent(e)) { arguments[0].submit(); }", form);`
	`636`	`+ String script = "var form = arguments[0];\n" +`
	`637`	`+ "while (form.nodeName != \"FORM\" && form.parentNode) {\n" +`
	`638`	`+ " form = form.parentNode;\n" +`
	`639`	`+ "}\n" +`
	`640`	`+ "if (!form) { throw Error('Unable to find containing form element'); }\n" +`
	`641`	`+ "if (!form.ownerDocument) { throw Error('Unable to find owning document'); }\n" +`
	`642`	`+ "var e = form.ownerDocument.createEvent('Event');\n" +`
	`643`	`+ "e.initEvent('submit', true, true);\n" +`
	`644`	`+ "if (form.dispatchEvent(e)) { HTMLFormElement.prototype.submit.call(form) }\n";`
	`645`	`+`
	`646`	`+ this.driver.ExecuteScript(script, this);`
`641`	`647`	`}`
`642`	`648`	`}`
`643`	`649`