Unignoring one more test in marionette, and fixing calls to deprecated methods.
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.openqa.selenium.testing.Driver.FIREFOX;
-import static org.openqa.selenium.testing.Driver.MARIONETTE;
import org.junit.After;
import org.junit.Test;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.testing.Ignore;
import org.openqa.selenium.testing.JUnit4TestBase;
-import org.openqa.selenium.testing.NotYetImplemented;
import java.io.IOException;
import java.util.Optional;
@@ -166,14 +164,13 @@ public void canUseSameProfileInCapabilitiesAndDirectly() {
localDriver = new FirefoxDriver(
new FirefoxOptions()
.setProfile(profile)
- .addDesiredCapabilities(caps));
+ .addCapabilities(caps));
wait.until($ -> "XHTML Test Page".equals(localDriver.getTitle()));
verifyItIsMarionette(localDriver);
}
@Test
- @NotYetImplemented(MARIONETTE)
public void canPassCapabilitiesBinaryAndProfileSeparately() throws IOException {
FirefoxBinary binary = spy(new FirefoxBinary());
@@ -188,7 +185,7 @@ public void canPassCapabilitiesBinaryAndProfileSeparately() throws IOException {
new FirefoxOptions()
.setBinary(binary)
.setProfile(profile)
- .addDesiredCapabilities(capabilities));
+ .addCapabilities(capabilities));
wait.until($ -> "XHTML Test Page".equals(localDriver.getTitle()));
verifyItIsMarionette(localDriver);
