Skip to content

Commit 6f25a6f

Browse files
committed
[grid] Ignoring case when parsing browser name
This is useful when a user types in the `config.yaml`, "Firefox" instead of "firefox". Before this change, if the browser name did not exactly match the one in the code, configs were ignored.
1 parent f9026c8 commit 6f25a6f

File tree

7 files changed

+20
-16
lines changed

7 files changed

+20
-16
lines changed

java/client/src/org/openqa/selenium/chrome/ChromeDriverInfo.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.openqa.selenium.chrome;
1919

2020
import com.google.auto.service.AutoService;
21+
2122
import org.openqa.selenium.Capabilities;
2223
import org.openqa.selenium.ImmutableCapabilities;
2324
import org.openqa.selenium.SessionNotCreatedException;
@@ -45,9 +46,9 @@ public Capabilities getCanonicalCapabilities() {
4546

4647
@Override
4748
public boolean isSupporting(Capabilities capabilities) {
48-
return BrowserType.CHROME.equals(capabilities.getBrowserName()) ||
49-
capabilities.getCapability("chromeOptions") != null ||
50-
capabilities.getCapability("goog:chromeOptions") != null;
49+
return BrowserType.CHROME.equalsIgnoreCase(capabilities.getBrowserName()) ||
50+
capabilities.getCapability("chromeOptions") != null ||
51+
capabilities.getCapability("goog:chromeOptions") != null;
5152
}
5253

5354
@Override

java/client/src/org/openqa/selenium/edge/EdgeDriverInfo.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public Capabilities getCanonicalCapabilities() {
4747

4848
@Override
4949
public boolean isSupporting(Capabilities capabilities) {
50-
return (BrowserType.EDGE.equals(capabilities.getBrowserName())
51-
|| capabilities.getCapability("ms:edgeOptions") != null
52-
|| capabilities.getCapability("edgeOptions") != null)
53-
&&
54-
(capabilities.getCapability(EdgeOptions.USE_CHROMIUM) == null
55-
|| Objects.equals(capabilities.getCapability(EdgeOptions.USE_CHROMIUM), true));
50+
return (BrowserType.EDGE.equalsIgnoreCase(capabilities.getBrowserName())
51+
|| capabilities.getCapability("ms:edgeOptions") != null
52+
|| capabilities.getCapability("edgeOptions") != null)
53+
&&
54+
(capabilities.getCapability(EdgeOptions.USE_CHROMIUM) == null
55+
|| Objects.equals(capabilities.getCapability(EdgeOptions.USE_CHROMIUM), true));
5656
}
5757

5858
@Override

java/client/src/org/openqa/selenium/firefox/GeckoDriverInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public boolean isSupporting(Capabilities capabilities) {
5151
return false;
5252
}
5353

54-
if (BrowserType.FIREFOX.equals(capabilities.getBrowserName())) {
54+
if (BrowserType.FIREFOX.equalsIgnoreCase(capabilities.getBrowserName())) {
5555
return true;
5656
}
5757

java/client/src/org/openqa/selenium/ie/InternetExplorerDriverInfo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.openqa.selenium.ie;
1919

2020
import com.google.auto.service.AutoService;
21+
2122
import org.openqa.selenium.Capabilities;
2223
import org.openqa.selenium.ImmutableCapabilities;
2324
import org.openqa.selenium.SessionNotCreatedException;
@@ -45,8 +46,8 @@ public Capabilities getCanonicalCapabilities() {
4546

4647
@Override
4748
public boolean isSupporting(Capabilities capabilities) {
48-
return BrowserType.IE.equals(capabilities.getBrowserName()) ||
49-
capabilities.getCapability("se:ieOptions") != null;
49+
return BrowserType.IE.equalsIgnoreCase(capabilities.getBrowserName()) ||
50+
capabilities.getCapability("se:ieOptions") != null;
5051
}
5152

5253
@Override

java/client/src/org/openqa/selenium/opera/OperaDriverInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public Capabilities getCanonicalCapabilities() {
4646

4747
@Override
4848
public boolean isSupporting(Capabilities capabilities) {
49-
return BrowserType.OPERA_BLINK.equals(capabilities.getBrowserName()) ||
50-
BrowserType.OPERA.equals(capabilities.getBrowserName());
49+
return BrowserType.OPERA_BLINK.equalsIgnoreCase(capabilities.getBrowserName()) ||
50+
BrowserType.OPERA.equalsIgnoreCase(capabilities.getBrowserName());
5151
}
5252

5353
@Override

java/client/src/org/openqa/selenium/safari/SafariDriverInfo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.openqa.selenium.safari;
1919

2020
import com.google.auto.service.AutoService;
21+
2122
import org.openqa.selenium.Capabilities;
2223
import org.openqa.selenium.ImmutableCapabilities;
2324
import org.openqa.selenium.SessionNotCreatedException;
@@ -45,7 +46,7 @@ public Capabilities getCanonicalCapabilities() {
4546

4647
@Override
4748
public boolean isSupporting(Capabilities capabilities) {
48-
if (BrowserType.SAFARI.equals(capabilities.getBrowserName())) {
49+
if (BrowserType.SAFARI.equalsIgnoreCase(capabilities.getBrowserName())) {
4950
return true;
5051
}
5152

java/client/src/org/openqa/selenium/safari/SafariTechPreviewDriverInfo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.openqa.selenium.safari;
1919

2020
import com.google.auto.service.AutoService;
21+
2122
import org.openqa.selenium.Capabilities;
2223
import org.openqa.selenium.ImmutableCapabilities;
2324
import org.openqa.selenium.SessionNotCreatedException;
@@ -44,7 +45,7 @@ public Capabilities getCanonicalCapabilities() {
4445

4546
@Override
4647
public boolean isSupporting(Capabilities capabilities) {
47-
if (SafariOptions.SAFARI_TECH_PREVIEW.equals(capabilities.getBrowserName())) {
48+
if (SafariOptions.SAFARI_TECH_PREVIEW.equalsIgnoreCase(capabilities.getBrowserName())) {
4849
return true;
4950
}
5051

0 commit comments

Comments
 (0)