Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[java] Remove Edge USE_CHROMIUM flag #9921

Merged
merged 1 commit into from Oct 14, 2021
Merged

[java] Remove Edge USE_CHROMIUM flag #9921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions java/src/org/openqa/selenium/edge/EdgeDriverInfo.java
View file
Open in desktop
Expand Up @@ -46,12 +46,9 @@ public Capabilities getCanonicalCapabilities() {

@Override
public boolean isSupporting(Capabilities capabilities) {
return (EDGE.is(capabilities.getBrowserName())
|| capabilities.getCapability("ms:edgeOptions") != null
|| capabilities.getCapability("edgeOptions") != null)
&&
(capabilities.getCapability(EdgeOptions.USE_CHROMIUM) == null
|| Objects.equals(capabilities.getCapability(EdgeOptions.USE_CHROMIUM), true));
return EDGE.is(capabilities.getBrowserName())
|| capabilities.getCapability("ms:edgeOptions") != null
|| capabilities.getCapability("edgeOptions") != null;
}

@Override
Expand Down
5 changes: 0 additions & 5 deletions java/src/org/openqa/selenium/edge/EdgeDriverService.java
View file
Open in desktop
Expand Up @@ -125,11 +125,6 @@ public int score(Capabilities capabilities) {
score++;
}

Object useChromium = capabilities.getCapability(EdgeOptions.USE_CHROMIUM);
if (Objects.equals(useChromium, false)) {
score--;
}

if (capabilities.getCapability(EdgeOptions.CAPABILITY) != null) {
score++;
}
Expand Down
7 changes: 0 additions & 7 deletions java/src/org/openqa/selenium/edge/EdgeOptions.java
View file
Open in desktop
Expand Up @@ -43,13 +43,6 @@
*/
public class EdgeOptions extends ChromiumOptions<EdgeOptions> {

/**
* Key used to indicate whether to use an Edge Chromium or Edge Legacy driver.
*
* @deprecated This will be removed as Chromium based Edge is the only supported one.
*/
public static final String USE_CHROMIUM = "ms:edgeChromium";

/**
* Key used to store a set of ChromeOptions in a {@link Capabilities}
* object.
Expand Down
26 changes: 0 additions & 26 deletions java/test/org/openqa/selenium/edge/EdgeDriverInfoTest.java
View file
Open in desktop
Expand Up @@ -46,22 +46,6 @@ public void isSupportingCapabilitiesWithProperBrowserNameOnly() {
new ImmutableCapabilities(CapabilityType.BROWSER_NAME, EDGE.browserName())));
}

@Test
public void isNotSupportingEdgeHtml() {
assertThat(new EdgeDriverInfo()).isNot(supporting(
new ImmutableCapabilities(
CapabilityType.BROWSER_NAME, EDGE.browserName(),
EdgeOptions.USE_CHROMIUM, false)));
}

@Test
public void isSupportingEdgeWithExplicitlySetChromiumFlag() {
assertThat(new EdgeDriverInfo()).is(supporting(
new ImmutableCapabilities(
CapabilityType.BROWSER_NAME, EDGE.browserName(),
EdgeOptions.USE_CHROMIUM, true)));
}

@Test
public void isNotSupportingFirefox() {
assertThat(new EdgeDriverInfo()).isNot(supporting(
Expand All @@ -76,16 +60,6 @@ public void canDetectBrowserByVendorSpecificCapability() {
new ImmutableCapabilities("edgeOptions", Collections.emptyMap())));
}

@Test
public void canRejectEdgeHtmlByVendorSpecificCapability() {
assertThat(new EdgeDriverInfo()).isNot(supporting(
new ImmutableCapabilities(EdgeOptions.CAPABILITY, Collections.emptyMap(),
EdgeOptions.USE_CHROMIUM, false)));
assertThat(new EdgeDriverInfo()).isNot(supporting(
new ImmutableCapabilities("edgeOptions", Collections.emptyMap(),
EdgeOptions.USE_CHROMIUM, false)));
}

private Condition<EdgeDriverInfo> supporting(Capabilities capabilities) {
return new Condition<>(info -> info.isSupporting(capabilities), "supporting " + capabilities);
}
Expand Down