Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

geckodriver: marionette: remove capabilities field wrapping for NewSession

Browse Source 
Remove one layer of wrapping inside the `capabilities' field when
geckodriver sends the capabilities to Marionette.

Prior to this patch, geckodriver would send the following JSON Object
to Marionette's newSession command:

	{capabilities: {foo: 1, {desiredCapabilities: {foo: 1}}}}

Following this patch, it sends:

	{foo: 1, {capabilities: {desiredCapabilities: {foo: 1}}}}

In the future, the idea is to remove the capabilities object altogether
and just send

	{foo: 1}

Source-Repo: https://github.com/mozilla/geckodriver
Source-Revision: c6cf7b9e2bc2d01bb20f9fb995ee29a892644d15

committer: jgraham <james@hoppipolla.co.uk>

--HG--
extra : rebase_source : efafe8e0f0ad4fe9cb853baade31be58e9a50e52
This commit is contained in:
Andreas Tolfsen 2017-04-07 14:26:58 +01:00
parent 31aea4a2a2
commit 88528d4cd9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
testing/geckodriver/src/marionette.rs
View File

@ -832,17 +832,17 @@ impl MarionetteCommand {
let (opt_name, opt_parameters) = match msg.command {
NewSession(_) => {
let caps = capabilities.expect("Tried to create new session without processing capabilities");
let mut data = BTreeMap::new();
data.insert("sessionId".to_string(), Json::Null);
let mut capabilites = BTreeMap::new();
for (key, value) in caps.iter() {
capabilites.insert(key.to_string(), value.to_json());
for (k, v) in caps.iter() {
data.insert(k.to_string(), v.to_json());
}
// Copy into a desiredCapabilities key for legacy compat.
capabilites.insert("desiredCapabilities".to_string(),
caps.to_json());
data.insert("capabilities".to_string(),
capabilites.to_json());
// duplicate in capabilities.desiredCapabilities for legacy compat
let mut legacy_caps = BTreeMap::new();
legacy_caps.insert("desiredCapabilities".to_string(), caps.to_json());
data.insert("capabilities".to_string(), legacy_caps.to_json());
(Some("newSession"), Some(Ok(data)))
},
DeleteSession => {