Skip to content

Remove 'browserName' capability from stereotype when using RelaySession #14247

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

Merged
merged 5 commits into from
Jul 12, 2024
Merged

Remove 'browserName' capability from stereotype when using RelaySession #14247

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
767ac89
Remove 'browserName' capability from stereotype. We expect it to be p…
bhecquet Jul 2, 2024
e487ce9
Merge branch 'trunk' into issue_14216
bhecquet Jul 10, 2024
a3a7de1
Only remove 'browserName' when 'appium:app' is present
bhecquet Jul 11, 2024
3dd2e87
Merge branch 'trunk' into issue_14216
diemol Jul 12, 2024
89c8134
Formatting file
diemol Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion java/src/org/openqa/selenium/grid/node/relay/RelaySessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.util.logging.Logger;
import org.openqa.selenium.Capabilities;
import org.openqa.selenium.ImmutableCapabilities;
import org.openqa.selenium.MutableCapabilities;
import org.openqa.selenium.SessionNotCreatedException;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.grid.data.CreateSessionRequest;
Expand All @@ -49,6 +50,7 @@
import org.openqa.selenium.internal.Debug;
import org.openqa.selenium.internal.Either;
import org.openqa.selenium.internal.Require;
import org.openqa.selenium.remote.CapabilityType;
import org.openqa.selenium.remote.Command;
import org.openqa.selenium.remote.Dialect;
import org.openqa.selenium.remote.DriverCommand;
Expand Down Expand Up @@ -146,7 +148,16 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
new SessionNotCreatedException(
"New session request capabilities do not " + "match the stereotype."));
}
capabilities = capabilities.merge(stereotype);

// remove browserName capability if 'appium:app' is present as it breaks appium tests when app
// is provided
// they are mutually exclusive
MutableCapabilities filteredStereotype = new MutableCapabilities(stereotype);
if (capabilities.getCapability("appium:app") != null) {
filteredStereotype.setCapability(CapabilityType.BROWSER_NAME, (String) null);
}

capabilities = capabilities.merge(filteredStereotype);
LOG.info("Starting session for " + capabilities);

try (Span span = tracer.getCurrentContext().createSpan("relay_session_factory.apply")) {
Expand Down