Skip to content

Fix session payload for W3C#913

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.

Sign up for GitHub

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

Merged
SrinivasanTarget merged 3 commits into from
Jun 13, 2018
Merged

Fix session payload for W3C #913

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44187fe
Fix session payload for W3C
SrinivasanTarget May 26, 2018
575a477
remove comment
SrinivasanTarget May 26, 2018
df1efca
Fix session payload in sync with other clients ruby and python
SrinivasanTarget Jun 6, 2018
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
14 changes: 6 additions & 8 deletions src/main/java/io/appium/java_client/remote/NewAppiumSessionPayload.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -268,16 +268,14 @@ public void writeTo(Appendable appendable) throws IOException {
json.name(CAPABILITIES);
json.beginObject();

json.name(DESIRED_CAPABILITIES);
json.write(first);

// Then write everything into the w3c payload. Because of the way we do this, it's easiest
// to just populate the "firstMatch" section. The spec says it's fine to omit the
// "alwaysMatch" field, so we do this.
json.name(ALWAYS_MATCH);
getW3C().forEach(json::write);

json.name(FIRST_MATCH);
json.beginArray();
//noinspection unchecked
getW3C().forEach(json::write);
json.beginObject();
json.endObject();
json.endArray();

json.endObject(); // Close "capabilities" object
Expand DownExpand Up@@ -547,4 +545,4 @@ private Map<String, Object> applyTransforms(Map<String, Object> caps) {
}
return toReturn;
}
}
}