Skip to content

[rust] Honor full browser version even if major version is installed (#15517) #16346

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 1 commit into from
Sep 24, 2025
Merged

[rust] Honor full browser version even if major version is installed (#15517) #16346

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 55 additions & 47 deletions rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,58 +490,66 @@ pub trait SeleniumManager {
discovered_version
));
}
let discovered_major_browser_version = self
.get_major_version(&discovered_version)
.unwrap_or_default();

if self.is_browser_version_stable() || self.is_browser_version_unstable() {
let online_browser_version = self.request_browser_version()?;
if online_browser_version.is_some() {
let major_online_browser_version =
self.get_major_version(&online_browser_version.unwrap())?;
if discovered_major_browser_version.eq(&major_online_browser_version) {
self.get_logger().debug(format!(
"Discovered online {} version ({}) is the same as the detected local {} version",
self.get_browser_name(),
discovered_major_browser_version,
self.get_browser_name(),
));
self.set_browser_version(discovered_version);
if self.is_browser_version_specific()
&& !self.get_browser_version().eq(&discovered_version)
{
download_browser = true;
} else {
let discovered_major_browser_version = self
.get_major_version(&discovered_version)
.unwrap_or_default();

if self.is_browser_version_stable() || self.is_browser_version_unstable() {
let online_browser_version = self.request_browser_version()?;
if online_browser_version.is_some() {
let major_online_browser_version =
self.get_major_version(&online_browser_version.unwrap())?;
if discovered_major_browser_version
.eq(&major_online_browser_version)
{
self.get_logger().debug(format!(
"Discovered online {} version ({}) is the same as the detected local {} version",
self.get_browser_name(),
discovered_major_browser_version,
self.get_browser_name(),
));
self.set_browser_version(discovered_version);
} else {
self.get_logger().debug(format!(
"Discovered online {} version ({}) is different to the detected local {} version ({})",
self.get_browser_name(),
major_online_browser_version,
self.get_browser_name(),
discovered_major_browser_version,
));
download_browser = true;
}
} else {
self.get_logger().debug(format!(
"Discovered online {} version ({}) is different to the detected local {} version ({})",
self.get_browser_name(),
major_online_browser_version,
self.get_browser_name(),
discovered_major_browser_version,
));
download_browser = true;
self.set_browser_version(discovered_version);
}
} else if !major_browser_version.is_empty()
&& !self.is_browser_version_unstable()
&& !major_browser_version.eq(&discovered_major_browser_version)
{
self.get_logger().debug(format!(
"Discovered {} version ({}) different to specified browser version ({})",
self.get_browser_name(),
discovered_major_browser_version,
major_browser_version,
));
download_browser = true;
} else {
self.set_browser_version(discovered_version);
}
} else if !major_browser_version.is_empty()
&& !self.is_browser_version_unstable()
&& !major_browser_version.eq(&discovered_major_browser_version)
{
self.get_logger().debug(format!(
"Discovered {} version ({}) different to specified browser version ({})",
self.get_browser_name(),
discovered_major_browser_version,
major_browser_version,
));
download_browser = true;
} else {
self.set_browser_version(discovered_version);
}
if self.is_webview2() && PathBuf::from(self.get_browser_path()).is_dir() {
let browser_path = format!(
r"{}\{}\msedge{}",
self.get_browser_path(),
&self.get_browser_version(),
get_binary_extension(self.get_os())
);
self.set_browser_path(browser_path);
if self.is_webview2() && PathBuf::from(self.get_browser_path()).is_dir() {
let browser_path = format!(
r"{}\{}\msedge{}",
self.get_browser_path(),
&self.get_browser_version(),
get_binary_extension(self.get_os())
);
self.set_browser_path(browser_path);
}
}
}
None => {
Expand Down
Loading