Mark tests as meant to be passing in Marionette
Except the one that sets noProxy. There's a known
problem with that one.
import org.openqa.selenium.testing.Ignore;
import org.openqa.selenium.testing.JUnit4TestBase;
import org.openqa.selenium.testing.NeedsLocalEnvironment;
+import org.openqa.selenium.testing.NotYetImplemented;
import org.openqa.selenium.testing.ProxyServer;
import org.openqa.selenium.testing.drivers.WebDriverBuilder;
import org.seleniumhq.jetty9.server.Handler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/764")
public class ProxySettingTest extends JUnit4TestBase {
@Rule
@@ -80,6 +80,7 @@ public void tearDown() {
@Test
@Ignore(SAFARI)
@Ignore(PHANTOMJS)
+ @NotYetImplemented(MARIONETTE)
@NeedsLocalEnvironment
public void canConfigureManualHttpProxy() {
Proxy proxyToUse = proxyServer.asProxy();
@@ -89,7 +90,7 @@ public void canConfigureManualHttpProxy() {
WebDriver driver = new WebDriverBuilder().setDesiredCapabilities(caps).get();
registerDriverTeardown(driver);
- driver.get(pages.simpleTestPage);
+ driver.get(appServer.whereElseIs("simpleTest.html"));
assertTrue("Proxy should have been called", proxyServer.hasBeenCalled("simpleTest.html"));
}
@@ -114,7 +115,7 @@ public void canConfigureProxyThroughPACFile() {
WebDriver driver = new WebDriverBuilder().setDesiredCapabilities(caps).get();
registerDriverTeardown(driver);
- driver.get(pages.mouseOverPage);
+ driver.get(appServer.whereElseIs("mouseOver.html"));
assertEquals("Should follow proxy to another server",
"Hello, world!", driver.findElement(By.tagName("h3")).getText());
}
@@ -149,7 +150,7 @@ public void canUsePACThatOnlyProxiesCertainHosts() throws Exception {
assertEquals("Should follow proxy to another server",
"Goodbye, world!", driver.findElement(By.tagName("h3")).getText());
- driver.get(pages.simpleTestPage);
+ driver.get(appServer.whereElseIs("simpleTest.html"));
assertEquals("Proxy should have permitted direct access to host",
"Heading", driver.findElement(By.tagName("h1")).getText());
}
