Deflake AlertsTest and FrameSwitchingTest.

Author: jleyba

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

@@ -314,7 +314,7 @@ public void testPromptShouldHaveNullValueIfDismissed() {
   @JavascriptEnabled
   @Test
   public void testHandlesTwoAlertsFromOneInteraction() {
-    driver.findElement(By.id("double-prompt")).click();
+    wait.until(presenceOfElementLocated(By.id("double-prompt"))).click();
 
     Alert alert1 = wait.until(alertIsPresent());
     alert1.sendKeys("brie");

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

@@ -484,8 +484,8 @@ public void testShouldNotSwitchMagicallyToTheTopWindow() {
 
     for (int i = 0; i < 20; i++) {
       try {
-        WebElement input = driver.findElement(By.id("inputText"));
-        WebElement submit = driver.findElement(By.id("submitButton"));
+        WebElement input = waitFor(elementToExist(driver, "inputText"));
+        WebElement submit = waitFor(elementToExist(driver, "submitButton"));
         input.clear();
         input.sendKeys("rand" + new Random().nextInt());
         submit.click();
@@ -516,4 +516,4 @@ private void assertFrameNotPresent(WebDriver driver, String locator) {
     fail("Frame did not disappear");
   }
 
-}
+}