Skip to content

Commit 3926580

Browse files
authored
[rust] Return complete safari and safaritp browser path (#12434)
1 parent c0317a5 commit 3926580

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

rust/src/safari.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ use crate::{create_http_client, format_one_arg, Logger, SeleniumManager, PLIST_C
2929

3030
pub const SAFARI_NAME: &str = "safari";
3131
pub const SAFARIDRIVER_NAME: &str = "safaridriver";
32+
const SAFARI_PATH: &str = r#"/Applications/Safari.app"#;
33+
const SAFARI_FULL_PATH: &str = r#"/Applications/Safari.app/Contents/MacOS/Safari"#;
3234

3335
pub struct SafariManager {
3436
pub browser_name: &'static str,
@@ -69,10 +71,7 @@ impl SeleniumManager for SafariManager {
6971
}
7072

7173
fn get_browser_path_map(&self) -> HashMap<BrowserPath, &str> {
72-
HashMap::from([(
73-
BrowserPath::new(MACOS, STABLE),
74-
r#"/Applications/Safari.app"#,
75-
)])
74+
HashMap::from([(BrowserPath::new(MACOS, STABLE), SAFARI_PATH)])
7675
}
7776

7877
fn discover_browser_version(&mut self) -> Option<String> {
@@ -90,6 +89,7 @@ impl SeleniumManager for SafariManager {
9089
} else {
9190
return None;
9291
};
92+
self.set_browser_path(SAFARI_FULL_PATH.to_string());
9393
self.detect_browser_version(command)
9494
}
9595

rust/src/safaritp.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ pub const SAFARITP_NAMES: &[&str] = &[
3434
"safaritechnologypreview",
3535
];
3636
pub const SAFARITPDRIVER_NAME: &str = "safaridriver";
37+
const SAFARITP_PATH: &str = r#"/Applications/Safari Technology Preview.app"#;
38+
const SAFARITP_FULL_PATH: &str =
39+
r#"/Applications/Safari Technology Preview.app/Contents/MacOS/Safari Technology Preview"#;
3740

3841
pub struct SafariTPManager {
3942
pub browser_name: &'static str,
@@ -74,10 +77,7 @@ impl SeleniumManager for SafariTPManager {
7477
}
7578

7679
fn get_browser_path_map(&self) -> HashMap<BrowserPath, &str> {
77-
HashMap::from([(
78-
BrowserPath::new(MACOS, STABLE),
79-
r#"/Applications/Safari\ Technology\ Preview.app"#,
80-
)])
80+
HashMap::from([(BrowserPath::new(MACOS, STABLE), SAFARITP_PATH)])
8181
}
8282

8383
fn discover_browser_version(&mut self) -> Option<String> {
@@ -95,6 +95,7 @@ impl SeleniumManager for SafariTPManager {
9595
} else {
9696
return None;
9797
};
98+
self.set_browser_path(SAFARITP_FULL_PATH.to_string());
9899
self.detect_browser_version(command)
99100
}
100101

0 commit comments

Comments
 (0)