Skip to content
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

Jump to bottom

Fix WebDriver compat with Safari #991

Merged
merged 1 commit into from
Oct 28, 2018
Merged

Fix WebDriver compat with Safari #991

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 13 additions & 1 deletion crates/cli/src/bin/wasm-bindgen-test-runner/headless.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,15 +284,27 @@ impl Client {
Driver::Safari(_) => {
#[derive(Deserialize)]
struct Response {
// returned by `--legacy`
#[serde(rename = "sessionId")]
session_id: Option<String>,
// returned by the now-default `--w3c` mode
value: Option<Value>,
}
#[derive(Deserialize)]
struct Value {
#[serde(rename = "sessionId")]
session_id: String,
}
let request = json!({
// this is needed for the now `--legacy` mode
"desiredCapabilities": {
},
// this is needed for the now `--w3c` (default) mode
"capabilities": {
}
});
let x: Response = self.post("/session", &request)?;
Ok(x.session_id)
Ok(x.session_id.or(x.value.map(|v| v.session_id)).unwrap())
}
Driver::Chrome(_) => {
#[derive(Deserialize)]
Expand Down