Mark failing Marionette tests as Ignored or NotYetImplemented

Jetski5822 · Oct 12, 2016 · 1d1a092 · 1d1a092
1 parent 6395cc3
commit 1d1a092
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/java/client/test/org/openqa/selenium/AlertsTest.java b/java/client/test/org/openqa/selenium/AlertsTest.java
@@ -165,8 +165,8 @@ public void testShouldAllowAUserToSetTheValueOfAPrompt() {
     wait.until(textInElementLocated(By.id("text"), "cheese"));
   }
 
-  @Ignore(value = {CHROME},
-    reason = "Marionette: https://github.com/jgraham/wires/issues/17")
+  @Ignore(value = {MARIONETTE, CHROME},
+    reason = "Marionette: https://github.com/mozilla/geckodriver/issues/274")
   @JavascriptEnabled
   @Test
   public void testSettingTheValueOfAnAlertThrows() {
@@ -241,6 +241,8 @@ public void testShouldAllowUsersToAcceptAnAlertInAFrame() {
   @JavascriptEnabled
   @SwitchToTopAfterTest
   @Test
+  @Ignore(value = MARIONETTE,
+    reason = "Marionette: https://bugzilla.mozilla.org/show_bug.cgi?id=1279211")
   public void testShouldAllowUsersToAcceptAnAlertInANestedFrame() {
     driver.switchTo().frame("iframeWithIframe").switchTo().frame("iframeWithAlert");
 

diff --git a/java/client/test/org/openqa/selenium/AtomsInjectionTest.java b/java/client/test/org/openqa/selenium/AtomsInjectionTest.java
@@ -17,20 +17,16 @@
 
 package org.openqa.selenium;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
-import org.openqa.selenium.testing.NotYetImplemented;
-
-import static org.junit.Assert.assertEquals;
-import static org.openqa.selenium.testing.Driver.MARIONETTE;
 
 public class AtomsInjectionTest extends JUnit4TestBase {
 
-  /** http://code.google.com/p/selenium/issues/detail?id=1333 */
   @JavascriptEnabled
   @Test
-  @NotYetImplemented({MARIONETTE})
   public void testInjectingAtomShouldNotTrampleOnUnderscoreGlobal() {
     driver.get(pages.underscorePage);
     driver.findElement(By.tagName("body"));

diff --git a/java/client/test/org/openqa/selenium/ChildrenFindingTest.java b/java/client/test/org/openqa/selenium/ChildrenFindingTest.java
@@ -17,22 +17,20 @@
 
 package org.openqa.selenium;
 
-import org.junit.Test;
-import org.openqa.selenium.testing.Ignore;
-import org.openqa.selenium.testing.JUnit4TestBase;
-import org.openqa.selenium.testing.NotYetImplemented;
-
-import java.util.List;
-
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import static org.openqa.selenium.testing.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Driver.REMOTE;
 
+import org.junit.Test;
+import org.openqa.selenium.testing.Ignore;
+import org.openqa.selenium.testing.JUnit4TestBase;
+
+import java.util.List;
+
 
 public class ChildrenFindingTest extends JUnit4TestBase {
   @Test
@@ -322,7 +320,6 @@ public void testLinkWithTrailingSpace() {
   }
 
   @Test
-  @NotYetImplemented(MARIONETTE)
   public void testElementCanGetLinkByLinkTestIgnoringTrailingWhitespace() {
     driver.get(pages.simpleTestPage);
     WebElement elem = driver.findElement(By.id("links"));

diff --git a/java/client/test/org/openqa/selenium/ClickTest.java b/java/client/test/org/openqa/selenium/ClickTest.java
@@ -216,6 +216,7 @@ public void testCanClickOnALinkThatContainsTextWrappedInASpan() {
   }
 
   @Test
+  @Ignore(value = MARIONETTE)
   public void testCanClickOnALinkThatContainsEmbeddedBlockElements() {
     assumeFalse(
         "Fails on Android phones: https://code.google.com/p/chromedriver/issues/detail?id=1022",

diff --git a/java/client/test/org/openqa/selenium/FormHandlingTest.java b/java/client/test/org/openqa/selenium/FormHandlingTest.java
@@ -37,6 +37,7 @@
 import org.junit.Test;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
+import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.TestUtilities;
 
 import java.io.File;
@@ -94,6 +95,8 @@ public void testShouldSubmitAFormWhenAnyElementWithinThatFormIsSubmitted() {
 
   @Test(expected = NoSuchElementException.class)
   @Ignore(value = {PHANTOMJS, SAFARI})
+  @NotYetImplemented(
+    value = MARIONETTE, reason = "Delegates to JS and so the wrong exception is returned")
   public void testShouldNotBeAbleToSubmitAFormThatDoesNotExist() {
     driver.get(pages.formPage);
     driver.findElement(By.name("SearchableText")).submit();

diff --git a/java/client/test/org/openqa/selenium/ImplicitWaitTest.java b/java/client/test/org/openqa/selenium/ImplicitWaitTest.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.openqa.selenium.testing.Driver.IE;
+import static org.openqa.selenium.testing.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Driver.PHANTOMJS;
 import static org.openqa.selenium.testing.Driver.SAFARI;
 
@@ -138,7 +139,7 @@ public void testShouldReturnAfterFirstAttemptToFindManyAfterDisablingImplicitWai
 
   @Test
   @JavascriptEnabled
-  @Ignore({IE, PHANTOMJS, SAFARI})
+  @Ignore({IE, MARIONETTE, PHANTOMJS, SAFARI})
   public void testShouldImplicitlyWaitForAnElementToBeVisibleBeforeInteracting() {
     driver.get(pages.dynamicPage);