Skip to content

[dotnet] Align binary location property for FirefoxOptions with other options #13901

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 2 commits into from
May 15, 2024
Merged

[dotnet] Align binary location property for FirefoxOptions with other options #13901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd95b83
[dotnet] Align binary location property for FirefoxOptions with other…
nvborisenko May 2, 2024
2ba835d
Merge branch 'trunk' into dotnet-ff-options-binary-location
nvborisenko May 15, 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
15 changes: 8 additions & 7 deletions dotnet/src/webdriver/Firefox/FirefoxOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class FirefoxOptions : DriverOptions
private const string FirefoxEnableDevToolsProtocolCapability = "moz:debuggerAddress";

private bool enableDevToolsProtocol;
private string browserBinaryLocation;
private string binaryLocation;
private FirefoxDriverLogLevel logLevel = FirefoxDriverLogLevel.Default;
private FirefoxProfile profile;
private List<string> firefoxArguments = new List<string>();
Expand Down Expand Up @@ -104,17 +104,18 @@ public FirefoxProfile Profile
/// </summary>
public override string BinaryLocation
{
get { return this.browserBinaryLocation; }
set { this.browserBinaryLocation = value; }
get { return this.binaryLocation; }
set { this.binaryLocation = value; }
}

/// <summary>
/// Gets or sets the path and file name of the Firefox browser executable.
/// </summary>
[Obsolete("Use BinaryLocation property instead of BrowserExecutableLocation. This one will be removed soon.")]
public string BrowserExecutableLocation
{
get { return this.browserBinaryLocation; }
set { this.browserBinaryLocation = value; }
get { return this.binaryLocation; }
set { this.binaryLocation = value; }
}

/// <summary>
Expand Down Expand Up @@ -302,9 +303,9 @@ private Dictionary<string, object> GenerateFirefoxOptionsDictionary()
firefoxOptions[FirefoxProfileCapability] = this.profile.ToBase64String();
}

if (!string.IsNullOrEmpty(this.browserBinaryLocation))
if (!string.IsNullOrEmpty(this.binaryLocation))
{
firefoxOptions[FirefoxBinaryCapability] = this.browserBinaryLocation;
firefoxOptions[FirefoxBinaryCapability] = this.binaryLocation;
}

if (this.logLevel != FirefoxDriverLogLevel.Default)
Expand Down
2 changes: 1 addition & 1 deletion dotnet/test/common/Environment/DriverFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
service = CreateService<FirefoxDriverService>();
if (!string.IsNullOrEmpty(this.browserBinaryLocation))
{
((FirefoxOptions)options).BrowserExecutableLocation = this.browserBinaryLocation;
((FirefoxOptions)options).BinaryLocation = this.browserBinaryLocation;
}
if (enableLogging)
{
Expand Down