Unignoring several tests fixed in the latest version of geckodriver (wires)

Author: barancev

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

@@ -64,6 +64,7 @@ public void setUp() throws Exception {
 
   @JavascriptEnabled
   @Test
+  @NoDriverAfterTest
   public void testShouldBeAbleToOverrideTheWindowAlertMethod() {
     ((JavascriptExecutor) driver).executeScript(
         "window.alert = function(msg) { document.getElementById('text').innerHTML = msg; }");
@@ -154,11 +155,11 @@ public void testShouldAllowAUserToDismissAPrompt() {
     assertEquals("Testing Alerts", driver.getTitle());
   }
 
-  @Ignore(MARIONETTE)
+  @Ignore(value = MARIONETTE, reason = "https://github.com/jgraham/wires/issues/17")
   @JavascriptEnabled
   @Test
-  @NotYetImplemented(value = HTMLUNIT,
-    reason = "HtmlUnit: click()/prompt need to run in different threads.")
+  @NotYetImplemented(value = {HTMLUNIT},
+    reason = "HtmlUnit: click()/prompt need to run in different threads")
   public void testShouldAllowAUserToSetTheValueOfAPrompt() {
     driver.findElement(By.id("prompt")).click();
 
@@ -169,7 +170,8 @@ public void testShouldAllowAUserToSetTheValueOfAPrompt() {
     wait.until(textInElementLocated(By.id("text"), "cheese"));
   }
 
-  @Ignore({CHROME, MARIONETTE})
+  @Ignore(value = {CHROME, MARIONETTE},
+    reason = "Marionette: https://github.com/jgraham/wires/issues/17")
   @JavascriptEnabled
   @Test
   public void testSettingTheValueOfAnAlertThrows() {
@@ -491,8 +493,9 @@ public void testShouldHandleAlertOnWindowClose() {
   }
 
   @JavascriptEnabled
-  @Ignore(value = {CHROME, MARIONETTE})
+  @Ignore(value = {CHROME})
   @Test
+  @NotYetImplemented(value = MARIONETTE, reason = "https://github.com/jgraham/wires/issues/21")
   public void testIncludesAlertTextInUnhandledAlertException() {
     driver.findElement(By.id("alert")).click();
     wait.until(alertIsPresent());

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

@@ -175,7 +175,7 @@ public void testShouldSetRelatedTargetForMouseOver() {
 
   @JavascriptEnabled
   @NoDriverAfterTest
-  @Ignore(value = {SAFARI, MARIONETTE}, reason = "Safari: issue 3693")
+  @Ignore(value = {SAFARI}, reason = "Safari: issue 3693")
   @Test
   public void testShouldOnlyFollowHrefOnce() {
     driver.get(pages.clicksPage);

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

@@ -262,7 +262,7 @@ public void testEmptyTextBoxesShouldReturnAnEmptyStringNotNull() {
   }
 
   @Test
-  @Ignore(value = {PHANTOMJS, SAFARI, HTMLUNIT},
+  @Ignore(value = {PHANTOMJS, SAFARI, HTMLUNIT, MARIONETTE},
           reason = "HtmlUnit: error; others: untested")
   public void handleFormWithJavascriptAction() {
     String url = appServer.whereIs("form_handling_js_submit.html");

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

@@ -424,7 +424,7 @@ public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrl() {
     assertThat(driver.getCurrentUrl(), equalTo(pages.framesetPage));
   }
 
-  @Ignore({CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI})
+  @Ignore({CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI, MARIONETTE})
   @Test
   public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrlForIframes() {
     driver.get(pages.iframePage);

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

@@ -388,6 +388,7 @@ public void testShouldNotHangIfDocumentOpenCallIsNeverFollowedByDocumentCloseCal
               + "PHANTOMJS: not tested",
           issues = {687})
   @NeedsLocalEnvironment
+  @NoDriverAfterTest
   @Test
   public void testPageLoadTimeoutCanBeChanged() {
     try {

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

@@ -49,7 +49,6 @@
 
 public class WindowSwitchingTest extends JUnit4TestBase {
 
-  @Ignore({MARIONETTE})
   @NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
   @Test
   public void testShouldSwitchFocusToANewWindowWhenItIsOpenedAndNotStopFutureOperations() {
@@ -314,7 +313,6 @@ public void testFailingToSwitchToAWindowLeavesTheCurrentWindowAsIs() {
   @NeedsFreshDriver
   @NoDriverAfterTest
   @Test
-  @Ignore(MARIONETTE)
   public void testCanCloseWindowWhenMultipleWindowsAreOpen() {
     driver.get(pages.xhtmlTestPage);
     Set<String> currentWindowHandles = driver.getWindowHandles();
@@ -337,7 +335,6 @@ public void testCanCloseWindowWhenMultipleWindowsAreOpen() {
   @NeedsFreshDriver
   @NoDriverAfterTest
   @Test
-  @Ignore(MARIONETTE)
   public void testCanCloseWindowAndSwitchBackToMainWindow() {
     driver.get(pages.xhtmlTestPage);
     Set<String> currentWindowHandles = driver.getWindowHandles();
@@ -363,7 +360,6 @@ public void testCanCloseWindowAndSwitchBackToMainWindow() {
   @NeedsFreshDriver
   @NoDriverAfterTest
   @Test
-  @Ignore(MARIONETTE)
   public void testClosingOnlyWindowShouldNotCauseTheBrowserToHang() {
     driver.get(pages.xhtmlTestPage);
     driver.close();