fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-04-14 16:36:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1298 from LegNeato/fix_high_sierra

Browse Source 
Fix headless test runner on macOS High Sierra
This commit is contained in:
Alex Crichton 2019-02-27 09:32:42 -06:00 committed by GitHub
commit 46955735d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,18 +281,20 @@ impl Client {
Ok(x.value.session_id) Ok(x.value.session_id)
} }
Driver::Safari(_) => { Driver::Safari(_) => {
#[derive(Deserialize)] #[derive(Clone, Deserialize)]
struct Response { struct Response {
// returned by `--legacy` // returned by `--legacy` or by default on High Sierra and lower.
#[serde(rename = "sessionId")] #[serde(rename = "sessionId")]
session_id: Option<String>, session_id: Option<String>,
// returned by the now-default `--w3c` mode // returned by the now-default `--w3c` mode
value: Option<Value>, value: Option<Value>,
} }
#[derive(Deserialize)] #[derive(Clone, Deserialize)]
struct Value { struct Value {
// This needs to be optional because both `--legacy` and High Sierra do not
// include a session id in the value entry.
#[serde(rename = "sessionId")] #[serde(rename = "sessionId")]
session_id: String, session_id: Option<String>,
} }
let request = json!({ let request = json!({
// this is needed for the now `--legacy` mode // this is needed for the now `--legacy` mode
@ -303,7 +305,10 @@ impl Client {
} }
}); });
let x: Response = self.post("/session", &request)?; let x: Response = self.post("/session", &request)?;
Ok(x.session_id.or(x.value.map(|v| v.session_id)).unwrap()) Ok(x.clone()
.session_id
.or_else(|| x.value.map(|v| v.session_id.unwrap()))
.unwrap())
} }
Driver::Chrome(_) => { Driver::Chrome(_) => {
#[derive(Deserialize)] #[derive(Deserialize)]