Skip to content

[rust] Include SM flag --selenium-version to specify the Selenium version (#15754) #15755

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.

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

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ pub const NOT_ADMIN_FOR_EDGE_INSTALLER_ERR_MSG: &str =
"{} can only be installed in Windows with administrator permissions";
pub const ONLINE_DISCOVERY_ERROR_MESSAGE: &str = "Unable to discover {}{} in online repository";
pub const UNC_PREFIX: &str = r"\\?\";
pub const SM_BETA_LABEL: &str = "0.";

pub trait SeleniumManager {
// ----------------------------------------------------------
Expand Down
10 changes: 6 additions & 4 deletions rust/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ use selenium_manager::grid::GridManager;
use selenium_manager::lock::clear_lock_if_required;
use selenium_manager::logger::{Logger, BROWSER_PATH, DRIVER_PATH};
use selenium_manager::metadata::clear_metadata;
use selenium_manager::REQUEST_TIMEOUT_SEC;
use selenium_manager::TTL_SEC;
use selenium_manager::{
clear_cache, get_manager_by_browser, get_manager_by_driver, SeleniumManager,
};
use selenium_manager::{REQUEST_TIMEOUT_SEC, SM_BETA_LABEL};
use std::backtrace::{Backtrace, BacktraceStatus};
use std::path::Path;
use std::process::exit;
Expand Down Expand Up @@ -145,6 +145,10 @@ struct Cli {
#[clap(long)]
language_binding: Option<String>,

/// Selenium version (to be sent to plausible.io)
#[clap(long, value_parser, default_value = "")]
selenium_version: String,

/// Avoid sends usage statistics to plausible.io
#[clap(long)]
avoid_stats: bool,
Expand Down Expand Up @@ -223,9 +227,7 @@ fn main() {
selenium_manager.set_cache_path(cache_path.clone());
selenium_manager.set_offline(cli.offline);
selenium_manager.set_language_binding(cli.language_binding.unwrap_or_default());
let sm_version = clap::crate_version!();
let selenium_version = sm_version.strip_prefix(SM_BETA_LABEL).unwrap_or(sm_version);
selenium_manager.set_selenium_version(selenium_version.to_string());
selenium_manager.set_selenium_version(cli.selenium_version);
selenium_manager.set_avoid_stats(cli.avoid_stats);
selenium_manager.set_skip_driver_in_path(cli.skip_driver_in_path);
selenium_manager.set_skip_browser_in_path(cli.skip_browser_in_path);
Expand Down