Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mozilla/geckodriver.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.rs4
-rw-r--r--src/marionette.rs8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main.rs b/src/main.rs
index 4fd8f2c..f6741db 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -224,7 +224,7 @@ mod tests {
let mut capabilities = capabilities();
let mut firefox_options: BTreeMap<String, Json> = BTreeMap::new();
firefox_options.insert("profile".into(), encoded_profile);
- capabilities.required.insert("firefoxOptions".into(), Json::Object(firefox_options));
+ capabilities.required.insert("moz:firefoxOptions".into(), Json::Object(firefox_options));
let options = FirefoxOptions::from_capabilities(&mut capabilities).unwrap();
let mut profile = options.profile.unwrap();
@@ -246,7 +246,7 @@ mod tests {
let mut prefs: BTreeMap<String, Json> = BTreeMap::new();
prefs.insert("browser.display.background_color".into(), Json::String("#00ff00".into()));
firefox_options.insert("prefs".into(), Json::Object(prefs));
- capabilities.required.insert("firefoxOptions".into(), Json::Object(firefox_options));
+ capabilities.required.insert("moz:firefoxOptions".into(), Json::Object(firefox_options));
let options = FirefoxOptions::from_capabilities(&mut capabilities).unwrap();
diff --git a/src/marionette.rs b/src/marionette.rs
index e8d078a..88f9e07 100644
--- a/src/marionette.rs
+++ b/src/marionette.rs
@@ -312,17 +312,17 @@ pub struct FirefoxOptions {
pub profile: Option<Profile>,
pub args: Option<Vec<String>>,
pub log: LogOptions,
- pub prefs: Vec<(String, Pref)>
+ pub prefs: Vec<(String, Pref)>,
}
impl FirefoxOptions {
pub fn from_capabilities(capabilities: &mut NewSessionParameters) -> WebDriverResult<FirefoxOptions> {
- if let Some(options) = capabilities.consume("firefoxOptions") {
+ if let Some(options) = capabilities.consume("moz:firefoxOptions") {
let firefox_options = try!(options
.as_object()
.ok_or(WebDriverError::new(
ErrorStatus::InvalidArgument,
- "'firefoxOptions' capability was not an object")));
+ "'moz:firefoxOptions' capability was not an object")));
let binary = try!(FirefoxOptions::load_binary(&firefox_options));
let profile = try!(FirefoxOptions::load_profile(&firefox_options));
let args = try!(FirefoxOptions::load_args(&firefox_options));
@@ -485,7 +485,7 @@ impl MarionetteHandler {
.ok_or(WebDriverError::new(ErrorStatus::UnknownError,
"Expected browser binary location, \
but unable to find binary in default location, \
- no 'firefoxOptions.binary' capability provided, \
+ no 'moz:firefoxOptions.binary' capability provided, \
and no binary flag set on the command line")));
let custom_profile = options.profile.is_some();