| 0.29.0
| ≥ 3.11 (3.14 Python)
diff --git a/src/android.rs b/src/android.rs
index 6aaf58e..e21c146 100644
--- a/src/android.rs
+++ b/src/android.rs
@@ -171,7 +171,18 @@ impl AndroidHandler {
buf
}
AndroidStorage::Internal => PathBuf::from("/data/local/tmp/test_root"),
- AndroidStorage::Sdcard => PathBuf::from("/mnt/sdcard/test_root"),
+ AndroidStorage::Sdcard => {
+ // We need to push the profile to a location on the device that can also
+ // be read and write by the application, and works for unrooted devices.
+ // The only location that meets this criteria is under:
+ // $EXTERNAL_STORAGE/Android/data/%options.package%/files
+ let response = device.execute_host_shell_command("echo $EXTERNAL_STORAGE")?;
+ let mut buf = PathBuf::from(response.trim_end_matches('\n'));
+ buf.push("Android/data");
+ buf.push(&options.package);
+ buf.push("files/test_root");
+ buf
+ }
};
debug!(
@@ -431,7 +442,19 @@ mod test {
buf
}
AndroidStorage::Internal => PathBuf::from("/data/local/tmp/test_root"),
- AndroidStorage::Sdcard => PathBuf::from("/mnt/sdcard/test_root"),
+ AndroidStorage::Sdcard => {
+ let response = handler
+ .process
+ .device
+ .execute_host_shell_command("echo $EXTERNAL_STORAGE")
+ .unwrap();
+
+ let mut buf = PathBuf::from(response.trim_end_matches('\n'));
+ buf.push("Android/data/");
+ buf.push(&package);
+ buf.push("files/test_root");
+ buf
+ }
};
assert_eq!(handler.test_root, test_root);
diff --git a/src/capabilities.rs b/src/capabilities.rs
index e21651e..a409cfe 100644
--- a/src/capabilities.rs
+++ b/src/capabilities.rs
@@ -583,7 +583,7 @@ impl FirefoxOptions {
));
}
- let mut android = AndroidOptions::new(package, storage);
+ let mut android = AndroidOptions::new(package.clone(), storage);
android.activity = match options.get("androidActivity") {
Some(json) => {
@@ -606,7 +606,25 @@ impl FirefoxOptions {
Some(activity)
}
- None => None,
+ None => {
+ match package.as_str() {
+ "org.mozilla.firefox"
+ | "org.mozilla.firefox_beta"
+ | "org.mozilla.fenix"
+ | "org.mozilla.fenix.debug"
+ | "org.mozilla.reference.browser" => {
+ Some("org.mozilla.fenix.IntentReceiverActivity".to_string())
+ }
+ "org.mozilla.focus"
+ | "org.mozilla.focus.debug"
+ | "org.mozilla.klar"
+ | "org.mozilla.klar.debug" => {
+ Some("org.mozilla.focus.activity.IntentReceiverActivity".to_string())
+ }
+ // For all other applications fallback to auto-detection.
+ _ => None,
+ }
+ }
};
android.device_serial = match options.get("androidDeviceSerial") {
@@ -644,7 +662,16 @@ impl FirefoxOptions {
Some(args)
}
- None => None,
+ None => {
+ // All GeckoView based applications support this view,
+ // and allow to open a blank page in a Gecko window.
+ Some(vec![
+ "-a".to_string(),
+ "android.intent.action.VIEW".to_string(),
+ "-d".to_string(),
+ "about:blank".to_string(),
+ ])
+ },
};
Ok(Some(android))
@@ -871,13 +898,7 @@ mod tests {
firefox_opts.insert("androidPackage".into(), json!(value));
let opts = make_options(firefox_opts).expect("valid firefox options");
- assert_eq!(
- opts.android,
- Some(AndroidOptions::new(
- value.to_string(),
- AndroidStorageInput::Auto
- ))
- );
+ assert_eq!(opts.android.unwrap().package, value.to_string());
}
}
@@ -899,20 +920,63 @@ mod tests {
}
#[test]
- fn fx_options_android_activity_valid_value() {
- for value in ["cheese", "Cheese_9"].iter() {
+ fn fx_options_android_activity_default_known_apps() {
+ let packages = vec![
+ "org.mozilla.firefox",
+ "org.mozilla.firefox_beta",
+ "org.mozilla.fenix",
+ "org.mozilla.fenix.debug",
+ "org.mozilla.focus",
+ "org.mozilla.focus.debug",
+ "org.mozilla.klar",
+ "org.mozilla.klar.debug",
+ "org.mozilla.reference.browser",
+ ];
+
+ for package in packages {
let mut firefox_opts = Capabilities::new();
- firefox_opts.insert("androidPackage".into(), json!("foo.bar"));
- firefox_opts.insert("androidActivity".into(), json!(value));
+ firefox_opts.insert("androidPackage".into(), json!(package));
let opts = make_options(firefox_opts).expect("valid firefox options");
- let android_opts = AndroidOptions {
- package: "foo.bar".to_owned(),
- activity: Some(value.to_string()),
- ..Default::default()
- };
- assert_eq!(opts.android, Some(android_opts));
+ assert!(opts
+ .android
+ .unwrap()
+ .activity
+ .unwrap()
+ .contains("IntentReceiverActivity"));
+ }
+ }
+
+ #[test]
+ fn fx_options_android_activity_default_unknown_apps() {
+ let packages = vec!["org.mozilla.geckoview_example", "com.some.other.app"];
+
+ for package in packages {
+ let mut firefox_opts = Capabilities::new();
+ firefox_opts.insert("androidPackage".into(), json!(package));
+
+ let opts = make_options(firefox_opts).expect("valid firefox options");
+ assert_eq!(opts.android.unwrap().activity, None);
}
+
+ let mut firefox_opts = Capabilities::new();
+ firefox_opts.insert(
+ "androidPackage".into(),
+ json!("org.mozilla.geckoview_example"),
+ );
+
+ let opts = make_options(firefox_opts).expect("valid firefox options");
+ assert_eq!(opts.android.unwrap().activity, None);
+ }
+
+ #[test]
+ fn fx_options_android_activity_override() {
+ let mut firefox_opts = Capabilities::new();
+ firefox_opts.insert("androidPackage".into(), json!("foo.bar"));
+ firefox_opts.insert("androidActivity".into(), json!("foo"));
+
+ let opts = make_options(firefox_opts).expect("valid firefox options");
+ assert_eq!(opts.android.unwrap().activity, Some("foo".to_string()));
}
#[test]
@@ -940,16 +1004,14 @@ mod tests {
firefox_opts.insert("androidDeviceSerial".into(), json!("cheese"));
let opts = make_options(firefox_opts).expect("valid firefox options");
- let android_opts = AndroidOptions {
- package: "foo.bar".to_owned(),
- device_serial: Some("cheese".to_owned()),
- ..Default::default()
- };
- assert_eq!(opts.android, Some(android_opts));
+ assert_eq!(
+ opts.android.unwrap().device_serial,
+ Some("cheese".to_string())
+ );
}
#[test]
- fn fx_options_android_serial_invalid() {
+ fn fx_options_android_device_serial_invalid() {
let mut firefox_opts = Capabilities::new();
firefox_opts.insert("androidPackage".into(), json!("foo.bar"));
firefox_opts.insert("androidDeviceSerial".into(), json!(42));
@@ -958,18 +1020,45 @@ mod tests {
}
#[test]
- fn fx_options_android_intent_arguments() {
+ fn fx_options_android_intent_arguments_defaults() {
+ let packages = vec![
+ "org.mozilla.firefox",
+ "org.mozilla.firefox_beta",
+ "org.mozilla.fenix",
+ "org.mozilla.fenix.debug",
+ "org.mozilla.geckoview_example",
+ "org.mozilla.reference.browser",
+ "com.some.other.app",
+ ];
+
+ for package in packages {
+ let mut firefox_opts = Capabilities::new();
+ firefox_opts.insert("androidPackage".into(), json!(package));
+
+ let opts = make_options(firefox_opts).expect("valid firefox options");
+ assert_eq!(
+ opts.android.unwrap().intent_arguments,
+ Some(vec![
+ "-a".to_string(),
+ "android.intent.action.VIEW".to_string(),
+ "-d".to_string(),
+ "about:blank".to_string(),
+ ])
+ );
+ }
+ }
+
+ #[test]
+ fn fx_options_android_intent_arguments_override() {
let mut firefox_opts = Capabilities::new();
firefox_opts.insert("androidPackage".into(), json!("foo.bar"));
firefox_opts.insert("androidIntentArguments".into(), json!(["lorem", "ipsum"]));
let opts = make_options(firefox_opts).expect("valid firefox options");
- let android_opts = AndroidOptions {
- package: "foo.bar".to_owned(),
- intent_arguments: Some(vec!["lorem".to_owned(), "ipsum".to_owned()]),
- ..Default::default()
- };
- assert_eq!(opts.android, Some(android_opts));
+ assert_eq!(
+ opts.android.unwrap().intent_arguments,
+ Some(vec!["lorem".to_string(), "ipsum".to_string()])
+ );
}
#[test]
diff --git a/src/command.rs b/src/command.rs
index f5bc27a..b3ccdb7 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -123,21 +123,21 @@ impl<'de> Deserialize<'de> for AddonInstallParameters {
struct Base64 {
addon: String,
temporary: Option,
- };
+ }
#[derive(Debug, Deserialize)]
#[serde(deny_unknown_fields)]
struct Path {
path: String,
temporary: Option,
- };
+ }
#[derive(Debug, Deserialize)]
#[serde(untagged)]
enum Helper {
Base64(Base64),
Path(Path),
- };
+ }
let params = match Helper::deserialize(deserializer)? {
Helper::Path(ref mut data) => AddonInstallParameters {
diff --git a/src/main.rs b/src/main.rs
index 4dd6c66..ca894e7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -130,6 +130,7 @@ enum Operation {
log_level: Option,
address: SocketAddr,
settings: MarionetteSettings,
+ deprecated_storage_arg: bool,
},
}
@@ -159,7 +160,8 @@ fn parse_args(app: &mut App) -> ProgramResult {
Err(e) => usage!("{}: {}:{}", e, host, port),
};
- let android_storage = value_t!(matches, "android_storage", AndroidStorageInput)?;
+ let android_storage = value_t!(matches, "android_storage", AndroidStorageInput)
+ .unwrap_or(AndroidStorageInput::Auto);
let binary = matches.value_of("binary").map(PathBuf::from);
@@ -189,6 +191,7 @@ fn parse_args(app: &mut App) -> ProgramResult {
log_level,
address,
settings,
+ deprecated_storage_arg: matches.is_present("android_storage"),
}
};
@@ -204,6 +207,7 @@ fn inner_main(app: &mut App) -> ProgramResult<()> {
log_level,
address,
settings,
+ deprecated_storage_arg,
} => {
if let Some(ref level) = log_level {
logging::init_with_level(*level).unwrap();
@@ -211,6 +215,10 @@ fn inner_main(app: &mut App) -> ProgramResult<()> {
logging::init().unwrap();
}
+ if deprecated_storage_arg {
+ warn!("--android-storage argument is deprecated and will be removed soon.");
+ };
+
let handler = MarionetteHandler::new(settings);
let listening = webdriver::server::start(address, handler, extension_routes())?;
info!("Listening on {}", listening.socket);
@@ -325,9 +333,8 @@ fn make_app<'a, 'b>() -> App<'a, 'b> {
Arg::with_name("android_storage")
.long("android-storage")
.possible_values(&["auto", "app", "internal", "sdcard"])
- .default_value("auto")
.value_name("ANDROID_STORAGE")
- .help("Selects storage location to be used for test data."),
+ .help("Selects storage location to be used for test data (deprecated)."),
)
}
diff --git a/src/marionette.rs b/src/marionette.rs
index 99a82f3..87657ba 100644
--- a/src/marionette.rs
+++ b/src/marionette.rs
@@ -309,7 +309,6 @@ impl MarionetteHandler {
prefs.insert("devtools.debugger.remote-enabled", Pref::new(true));
prefs.insert("devtools.chrome.enabled", Pref::new(true));
prefs.insert("devtools.debugger.prompt-connection", Pref::new(false));
- prefs.insert("marionette.debugging.clicktostart", Pref::new(true));
}
prefs.insert("marionette.log.level", logging::max_level().into());
diff --git a/src/prefs.rs b/src/prefs.rs
index 075d0c6..33da0e5 100644
--- a/src/prefs.rs
+++ b/src/prefs.rs
@@ -120,9 +120,6 @@ lazy_static! {
// that may cause unexpected test timeouts.
("idle.lastDailyNotification", Pref::new(-1)),
- // Show chrome errors and warnings in the error console
- ("javascript.options.showInConsole", Pref::new(true)),
-
// Disable download and usage of OpenH264, and Widevine plugins
("media.gmp-manager.updateEnabled", Pref::new(false)),
|