Skip to content

Commit 3291605

Browse files
committedAug 14, 2017
Unignoring one more test in marionette, and fixing calls to deprecated methods.
1 parent fb3d4c4 commit 3291605

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed
 

‎java/client/test/org/openqa/selenium/firefox/MarionetteTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@
2525
import static org.mockito.Mockito.spy;
2626
import static org.mockito.Mockito.verify;
2727
import static org.openqa.selenium.testing.Driver.FIREFOX;
28-
import static org.openqa.selenium.testing.Driver.MARIONETTE;
2928

3029
import org.junit.After;
3130
import org.junit.Test;
3231
import org.openqa.selenium.remote.CapabilityType;
3332
import org.openqa.selenium.remote.DesiredCapabilities;
3433
import org.openqa.selenium.testing.Ignore;
3534
import org.openqa.selenium.testing.JUnit4TestBase;
36-
import org.openqa.selenium.testing.NotYetImplemented;
3735

3836
import java.io.IOException;
3937
import java.util.Optional;
@@ -166,14 +164,13 @@ public void canUseSameProfileInCapabilitiesAndDirectly() {
166164
localDriver = new FirefoxDriver(
167165
new FirefoxOptions()
168166
.setProfile(profile)
169-
.addDesiredCapabilities(caps));
167+
.addCapabilities(caps));
170168
wait.until($ -> "XHTML Test Page".equals(localDriver.getTitle()));
171169

172170
verifyItIsMarionette(localDriver);
173171
}
174172

175173
@Test
176-
@NotYetImplemented(MARIONETTE)
177174
public void canPassCapabilitiesBinaryAndProfileSeparately() throws IOException {
178175
FirefoxBinary binary = spy(new FirefoxBinary());
179176

@@ -188,7 +185,7 @@ public void canPassCapabilitiesBinaryAndProfileSeparately() throws IOException {
188185
new FirefoxOptions()
189186
.setBinary(binary)
190187
.setProfile(profile)
191-
.addDesiredCapabilities(capabilities));
188+
.addCapabilities(capabilities));
192189
wait.until($ -> "XHTML Test Page".equals(localDriver.getTitle()));
193190

194191
verifyItIsMarionette(localDriver);

0 commit comments

Comments
 (0)