A new test for the case of an alert generated by form submit

Author: barancev

java/client/test/org/openqa/selenium/AlertsTest.java

@@ -597,6 +597,24 @@ public void testCanQuitWhenAnAlertIsPresent() {
     driver.quit();
   }
 
+  @JavascriptEnabled
+  @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/620")
+  public void shouldHandleAlertOnFormSubmit() {
+    driver.get(appServer.create(new Page().withTitle("Testing Alerts").withBody(
+        "<form id='theForm' action='javascript:alert(\"Tasty cheese\");'>",
+        "<input id='unused' type='submit' value='Submit'>",
+        "</form>")));
+
+    driver.findElement(By.id("theForm")).submit();
+    Alert alert = wait.until(alertIsPresent());
+    String value = alert.getText();
+    alert.accept();
+
+    assertEquals("Tasty cheese", value);
+    assertEquals("Testing Alerts", driver.getTitle());
+  }
+
   private static ExpectedCondition<Boolean> textInElementLocated(
       final By locator, final String text) {
     return driver -> text.equals(driver.findElement(locator).getText());

java/client/test/org/openqa/selenium/FormHandlingTest.java

@@ -25,6 +25,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
+import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent;
 import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
 import static org.openqa.selenium.testing.Driver.IE;
 import static org.openqa.selenium.testing.Driver.MARIONETTE;
@@ -272,12 +273,13 @@ public void testEmptyTextBoxesShouldReturnAnEmptyStringNotNull() {
   @Test
   @Ignore(PHANTOMJS)
   @Ignore(SAFARI)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/620")
   public void handleFormWithJavascriptAction() {
     String url = appServer.whereIs("form_handling_js_submit.html");
     driver.get(url);
     WebElement element = driver.findElement(By.id("theForm"));
     element.submit();
-    Alert alert = driver.switchTo().alert();
+    Alert alert = wait.until(alertIsPresent());
     String text = alert.getText();
     alert.accept();