Skip to content

Commit

Permalink
Unignoring marionette tests that pass locally
Browse files Browse the repository at this point in the history
  • Loading branch information
barancev committed Apr 3, 2017
1 parent 7408424 commit 3fbec31
Show file tree
Hide file tree
Showing 12 changed files with 10 additions and 41 deletions.
9 changes: 2 additions & 7 deletions java/client/test/org/openqa/selenium/AlertsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ public void testShouldAllowAUserToDismissAPrompt() {
assertEquals("Testing Alerts", driver.getTitle());
}

@Ignore(value = MARIONETTE, reason = "https://github.com/jgraham/wires/issues/17")
@JavascriptEnabled
@Test
@NotYetImplemented(value = {HTMLUNIT},
Expand Down Expand Up @@ -228,7 +227,6 @@ public void testAlertShouldNotAllowAdditionalCommandsIfDismissed() {
@JavascriptEnabled
@SwitchToTopAfterTest
@Test
@Ignore(value = MARIONETTE)
public void testShouldAllowUsersToAcceptAnAlertInAFrame() {
driver.switchTo().frame("iframeWithAlert");

Expand All @@ -244,8 +242,6 @@ 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");

Expand All @@ -269,7 +265,6 @@ public void testSwitchingToMissingAlertThrows() throws Exception {
}
}

@Ignore(MARIONETTE)
@JavascriptEnabled
@Test
public void testSwitchingToMissingAlertInAClosedWindowThrows() throws Exception {
Expand Down Expand Up @@ -319,7 +314,6 @@ public void testPromptShouldHaveNullValueIfDismissed() {
wait.until(textInElementLocated(By.id("text"), "null"));
}

@Ignore(MARIONETTE)
@JavascriptEnabled
@Test
@NotYetImplemented(value = HTMLUNIT,
Expand Down Expand Up @@ -480,7 +474,8 @@ public void testShouldHandleAlertOnWindowClose() {
@JavascriptEnabled
@Ignore(value = {CHROME})
@Test
@NotYetImplemented(value = MARIONETTE, reason = "https://github.com/jgraham/wires/issues/21")
@NotYetImplemented(value = MARIONETTE,
reason = "https://bugzilla.mozilla.org/show_bug.cgi?id=1279211")
public void testIncludesAlertTextInUnhandledAlertException() {
driver.findElement(By.id("alert")).click();
wait.until(alertIsPresent());
Expand Down
6 changes: 1 addition & 5 deletions java/client/test/org/openqa/selenium/ClickTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public void testCanClickOnAnAnchorAndNotReloadThePage() {
}

@Test
@Ignore(value = {MARIONETTE}, reason = "getPageSource issue")
@SwitchToTopAfterTest
public void testCanClickOnALinkThatUpdatesAnotherFrame() {
driver.switchTo().frame("source");
Expand All @@ -92,7 +91,6 @@ public void testCanClickOnALinkThatUpdatesAnotherFrame() {

@JavascriptEnabled
@Test
@Ignore(value = {MARIONETTE}, reason = "getPageSource issue")
@SwitchToTopAfterTest
public void testElementsFoundByJsCanLoadUpdatesInAnotherFrame() {
driver.switchTo().frame("source");
Expand All @@ -108,7 +106,6 @@ public void testElementsFoundByJsCanLoadUpdatesInAnotherFrame() {

@JavascriptEnabled
@Test
@Ignore(value = {MARIONETTE})
@SwitchToTopAfterTest
public void testJsLocatedElementsCanUpdateFramesIfFoundSomehowElse() {
driver.switchTo().frame("source");
Expand Down Expand Up @@ -216,7 +213,6 @@ 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",
Expand Down Expand Up @@ -255,7 +251,7 @@ public void testClicksASurroundingStrongTag() {
}

@Test
@Ignore(value = {IE, MARIONETTE}, reason = "IE: failed, others: not tested")
@Ignore(value = {IE, MARIONETTE})
public void testCanClickAnImageMapArea() {
driver.get(appServer.whereIs("click_tests/google_map.html"));
driver.findElement(By.id("rectG")).click();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue()
assertThat(editable.getText(), equalTo(initialText + ", edited"));
}

@Ignore(value = {IE, SAFARI, HTMLUNIT, MARIONETTE},
@Ignore(value = {IE, SAFARI, HTMLUNIT},
reason = "Untested browsers;" +
" Safari: cannot type on contentEditable with synthetic events",
issues = {3127})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ public void testShouldEmitOnChangeEventsWhenSelectingElements() {
}

@JavascriptEnabled
@Ignore(MARIONETTE)
@Test
public void testShouldEmitOnClickEventsWhenSelectingElements() {
driver.get(pages.javascriptPage);
Expand Down Expand Up @@ -426,7 +425,6 @@ public void testShouldReportTheXAndYCoordinatesWhenClicking() {
}

@JavascriptEnabled
@Ignore(value = {MARIONETTE})
@Test
public void testClickEventsShouldBubble() {
driver.get(pages.clicksPage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ public void testShouldReturnEmptyAttributeValuesWhenPresentAndTheValueIsActually
assertThat(body.getAttribute("style"), equalTo(""));
}

@Ignore({MARIONETTE})
@Test
public void testShouldReturnTheValueOfTheDisabledAttributeAsNullIfNotSet() {
driver.get(pages.formPage);
Expand Down Expand Up @@ -358,7 +357,6 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_textArea() {
shortWait.until(ExpectedConditions.attributeToBe(element, "value", "hello world"));
}

@Ignore({MARIONETTE})
@Test
public void testShouldReturnNullForNonPresentBooleanAttributes() {
driver.get(pages.booleanAttributes);
Expand All @@ -383,7 +381,6 @@ public void testShouldReturnTrueForPresentBooleanAttributes() {
assertEquals("true", element5.getAttribute("nowrap"));
}

@Ignore({MARIONETTE})
@Test
public void testMultipleAttributeShouldBeNullWhenNotSet() {
driver.get(pages.selectPage);
Expand Down Expand Up @@ -421,7 +418,6 @@ public void testMultipleAttributeShouldBeTrueWhenSelectHasMultipleWithValueAsSom

@JavascriptEnabled
@Test
@Ignore(MARIONETTE)
public void testGetAttributeOfUserDefinedProperty() {
driver.get(pages.userDefinedProperty);
WebElement element = driver.findElement(By.id("d"));
Expand Down
2 changes: 0 additions & 2 deletions java/client/test/org/openqa/selenium/ElementFindingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,6 @@ public void testShouldFindMultipleElementsByLinkTextContainingEqualsSign() {
}

@Test
@Ignore({MARIONETTE})
public void findsByLinkTextOnXhtmlPage() {
assumeFalse("Old IE doesn't render XHTML pages, don't try loading XHTML pages in it",
isOldIe(driver));
Expand All @@ -651,7 +650,6 @@ public void testLinkWithFormattingTags() {
}

@Test
@Ignore(MARIONETTE)
public void testDriverCanGetLinkByLinkTestIgnoringTrailingWhitespace() {
driver.get(pages.simpleTestPage);
WebElement link = driver.findElement(By.linkText("link with trailing space"));
Expand Down
3 changes: 1 addition & 2 deletions java/client/test/org/openqa/selenium/ErrorsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import static org.junit.Assert.assertEquals;
import static org.openqa.selenium.testing.Driver.IE;
import static org.openqa.selenium.testing.Driver.MARIONETTE;

import org.junit.Test;
import org.openqa.selenium.testing.Ignore;
Expand All @@ -39,7 +38,7 @@ public class ErrorsTest extends JUnit4TestBase {
* Explorer).
*/
@JavascriptEnabled
@Ignore(value = {IE, MARIONETTE}, reason = "IE does not support onerror")
@Ignore(value = {IE}, reason = "IE does not support onerror")
@Test
public void testShouldNotGenerateErrorsWhenOpeningANewPage() {
driver.get(pages.errorsPage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void shouldBeAbleToReturnArraysOfWebElementsFromAsyncScripts() {

@JavascriptEnabled
@Test
@Ignore(value = {HTMLUNIT, MARIONETTE})
@Ignore(value = {HTMLUNIT})
public void shouldTimeoutIfScriptDoesNotInvokeCallback() {
driver.get(pages.ajaxyPage);
try {
Expand All @@ -175,7 +175,7 @@ public void shouldTimeoutIfScriptDoesNotInvokeCallback() {

@JavascriptEnabled
@Test
@Ignore(value = {HTMLUNIT, MARIONETTE})
@Ignore(value = {HTMLUNIT})
public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithAZeroTimeout() {
driver.get(pages.ajaxyPage);
try {
Expand All @@ -188,7 +188,6 @@ public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithAZeroTimeout() {

@JavascriptEnabled
@Test
@Ignore(value = {MARIONETTE})
public void shouldNotTimeoutIfScriptCallsbackInsideAZeroTimeout() {
driver.get(pages.ajaxyPage);
executor.executeAsyncScript(
Expand All @@ -198,7 +197,7 @@ public void shouldNotTimeoutIfScriptCallsbackInsideAZeroTimeout() {

@JavascriptEnabled
@Test
@Ignore(value = {HTMLUNIT, MARIONETTE})
@Ignore(value = {HTMLUNIT})
public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithLongTimeout() {
driver.manage().timeouts().setScriptTimeout(500, TimeUnit.MILLISECONDS);
driver.get(pages.ajaxyPage);
Expand Down Expand Up @@ -277,7 +276,6 @@ public void shouldCatchErrorsWithMessageAndStacktraceWhenExecutingInitialScript(

@JavascriptEnabled
@Test
@Ignore(value = {MARIONETTE})
public void shouldBeAbleToExecuteAsynchronousScripts() {
driver.get(pages.ajaxyPage);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ public void testShouldThrowAnExceptionWithMessageAndStacktraceWhenTheJavascriptI

@JavascriptEnabled
@Test
@Ignore(MARIONETTE)
public void testShouldBeAbleToCallFunctionsDefinedOnThePage() {
driver.get(pages.javascriptPage);
executeScript("displayMessage('I like cheese');");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ public void testShouldBeAbleToFindElementAfterJavascriptCausesANewPageToLoad() {

@JavascriptEnabled
@Test
@Ignore(MARIONETTE)
public void testShouldFireOnChangeEventWhenSettingAnElementsValue() {
driver.get(pages.javascriptPage);
driver.findElement(By.id("change")).sendKeys("foo");
Expand Down Expand Up @@ -153,7 +152,6 @@ public void testIssue80ClickShouldGenerateClickEvent() {

@JavascriptEnabled
@Test
@Ignore(MARIONETTE)
public void testShouldBeAbleToSwitchToFocusedElement() {
driver.get(pages.javascriptPage);

Expand All @@ -165,7 +163,6 @@ public void testShouldBeAbleToSwitchToFocusedElement() {

@JavascriptEnabled
@Test
@Ignore(MARIONETTE)
public void testIfNoElementHasFocusTheActiveElementIsTheBody() {
driver.get(pages.simpleTestPage);

Expand All @@ -175,7 +172,7 @@ public void testIfNoElementHasFocusTheActiveElementIsTheBody() {
}

@JavascriptEnabled
@Ignore(value = {SAFARI, MARIONETTE}, reason = " Safari: issue 4061. Other platforms: not properly tested")
@Ignore(value = {SAFARI}, reason = " Safari: issue 4061. Other platforms: not properly tested")
@Test
public void testChangeEventIsFiredAppropriatelyWhenFocusIsLost() {
driver.get(pages.javascriptPage);
Expand Down Expand Up @@ -241,7 +238,7 @@ public void testShouldBeAbleToGetTheLocationOfAnElement() {
* running: "ImplicitWaitTest", "TemporaryFilesystemTest", "JavascriptEnabledDriverTest".
* SimonStewart 2010-10-04
*/
@Ignore(value = {SAFARI, MARIONETTE}, reason = "Safari: issue 3693")
@Ignore(value = {SAFARI}, reason = "Safari: issue 3693")
@JavascriptEnabled
@NeedsFreshDriver
@Test
Expand Down
3 changes: 0 additions & 3 deletions java/client/test/org/openqa/selenium/MiscTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import static org.junit.Assert.assertTrue;
import static org.openqa.selenium.testing.Driver.CHROME;
import static org.openqa.selenium.testing.Driver.IE;
import static org.openqa.selenium.testing.Driver.MARIONETTE;
import static org.openqa.selenium.testing.Driver.SAFARI;

import org.junit.Test;
Expand Down Expand Up @@ -61,7 +60,6 @@ public void shouldReturnTagName() {

@JavascriptEnabled
@Test
@Ignore(MARIONETTE)
public void testShouldReturnTheSourceOfAPage() {
driver.get(pages.simpleTestPage);

Expand Down Expand Up @@ -102,7 +100,6 @@ public void testStimulatesStrangeOnloadInteractionInFirefox()

@JavascriptEnabled
@Test
@Ignore(MARIONETTE)
public void testClickingShouldNotTrampleWOrHInGlobalScope() throws Throwable {
driver.get(appServer.whereIs("globalscope.html"));
String[] vars = new String[]{"w", "h"};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@

package org.openqa.selenium;

import static org.openqa.selenium.testing.Driver.MARIONETTE;

import org.junit.Test;
import org.openqa.selenium.testing.Ignore;
import org.openqa.selenium.testing.JUnit4TestBase;

/**
Expand Down Expand Up @@ -49,7 +46,6 @@ public void testUninitializedWebDriverDoesNotThrowNPE() {
* WebDriver with an initial call to get(). It also should not fail.
*/
@Test
@Ignore(MARIONETTE)
public void testInitializedWebDriverDoesNotThrowNPE() {
driver.get(pages.simpleTestPage);
try {
Expand Down

0 comments on commit 3fbec31

Please sign in to comment.