Skip to content
This repository was archived by the owner on Apr 1, 2019. It is now read-only.

Correct conditional check for acceptsInsecureCerts #91

Closed
wants to merge 3 commits into from
Closed

Correct conditional check for acceptsInsecureCerts #91

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d183a6
Error message for string types describes wrong type.
AutomatedTester Apr 13, 2017
6911e7a
Correct conditional check around `acceptsInsecureCerts`. Fixes #638
AutomatedTester Apr 13, 2017
3c8535f
fixup! Correct conditional check around `acceptsInsecureCerts`. Fixes…
AutomatedTester Apr 13, 2017
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
9 changes: 4 additions & 5 deletions src/capabilities.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl SpecNewSessionParameters {
x @ "browserVersion" |
x @ "platformName" => if !value.is_string() {
return Err(WebDriverError::new(ErrorStatus::InvalidArgument,
format!("{} was not a boolean", x)))
format!("{} was not a string", x)))
},
"pageLoadStrategy" => {
try!(SpecNewSessionParameters::validate_page_load_strategy(value))
Expand Down Expand Up @@ -417,12 +417,11 @@ impl CapabilitiesMatching for SpecNewSessionParameters {
}
}
"acceptInsecureCerts" => {
if value.as_boolean().unwrap_or(false) &&
!browser_capabilities
if browser_capabilities
.accept_insecure_certs(merged)
.unwrap_or(false) {
return None;
}
return None;
}
},
"proxy" => {
let default = BTreeMap::new();
Expand Down