fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-03-31 01:11:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #991 from alexcrichton/safaridriver

Browse Source 
Fix WebDriver compat with Safari
This commit is contained in:
Alex Crichton 2018-10-28 13:54:03 -07:00 committed by GitHub
commit 451004defc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/cli/src/bin/wasm-bindgen-test-runner/headless.rs
View File

@ -284,15 +284,27 @@ impl Client {
Driver::Safari(_) => { Driver::Safari(_) => {
#[derive(Deserialize)] #[derive(Deserialize)]
struct Response { 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")] #[serde(rename = "sessionId")]
session_id: String, session_id: String,
} }
let request = json!({ let request = json!({
// this is needed for the now `--legacy` mode
"desiredCapabilities": { "desiredCapabilities": {
},
// this is needed for the now `--w3c` (default) mode
"capabilities": {
} }
}); });
let x: Response = self.post("/session", &request)?; 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(_) => { Driver::Chrome(_) => {
#[derive(Deserialize)] #[derive(Deserialize)]