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

Fix and streamline capability handling #51

Merged
merged 6 commits into from
Jan 1, 2025
Merged

Fix and streamline capability handling #51

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7093bb
Fix and streamline capability handling
uuf6429 Nov 19, 2024
a5f4930
Allow accessing capabilities; add capabilities tests
uuf6429 Nov 21, 2024
024c979
SA fix
uuf6429 Nov 21, 2024
25d1859
Another SA fix
uuf6429 Nov 21, 2024
1579ecd
Remove pointless null
uuf6429 Jan 1, 2025
686c68d
Merge remote-tracking branch 'origin/main' into chore/fix-and-improve…
uuf6429 Jan 1, 2025
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
33 changes: 13 additions & 20 deletions src/WebdriverClassicDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,29 +789,22 @@ private function getNormalisedBrowserName(): string
*/
private function initCapabilities(array $desiredCapabilities): DesiredCapabilities
{
// Build base capabilities
$caps = $this->getBrowserSpecificCapabilities() ?? new DesiredCapabilities();

// Set defaults
$defaults = array_merge(
self::DEFAULT_CAPABILITIES['default'],
self::DEFAULT_CAPABILITIES[$this->getNormalisedBrowserName()] ?? []
);
foreach ($defaults as $key => $value) {
if ($caps->getCapability($key) === null) {
$caps->setCapability($key, $value);
}
}

// Merge in other requested types
foreach ($desiredCapabilities as $key => $value) {
$caps->setCapability($key, $value);
$capabilities = $this->createBrowserSpecificCapabilities();

foreach (
array_merge(
self::DEFAULT_CAPABILITIES['default'],
self::DEFAULT_CAPABILITIES[$this->getNormalisedBrowserName()] ?? [],
$desiredCapabilities,
) as $capabilityKey => $capabilityValue
) {
$capabilities->setCapability($capabilityKey, $capabilityValue);
}

return $caps;
return $capabilities;
}

private function getBrowserSpecificCapabilities(): ?DesiredCapabilities
private function createBrowserSpecificCapabilities(): DesiredCapabilities
{
switch ($this->getNormalisedBrowserName()) {
case WebDriverBrowserType::FIREFOX:
Expand Down Expand Up @@ -855,7 +848,7 @@ private function getBrowserSpecificCapabilities(): ?DesiredCapabilities
case WebDriverBrowserType::MOCK:
case WebDriverBrowserType::IE_HTA:
default:
return null;
return new DesiredCapabilities();
}
}

Expand Down