From 7d183a6a0767f3c2ccfa2e6e3ff2e3d484d8f869 Mon Sep 17 00:00:00 2001
From: AutomatedTester <david.burns@theautomatedtester.co.uk>
Date: Thu, 13 Apr 2017 17:05:48 +0100
Subject: [PATCH 1/3] Error message for string types describes wrong type.

---
 src/capabilities.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/capabilities.rs b/src/capabilities.rs
index 2be6376..f9e0989 100644
--- a/src/capabilities.rs
+++ b/src/capabilities.rs
@@ -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))

From 6911e7a00fc181b05abedb146b27dca4604763d9 Mon Sep 17 00:00:00 2001
From: AutomatedTester <david.burns@theautomatedtester.co.uk>
Date: Thu, 13 Apr 2017 18:28:48 +0100
Subject: [PATCH 2/3] Correct conditional check around `acceptsInsecureCerts`.
 Fixes #638

---
 src/capabilities.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/capabilities.rs b/src/capabilities.rs
index f9e0989..de8025e 100644
--- a/src/capabilities.rs
+++ b/src/capabilities.rs
@@ -417,12 +417,9 @@ impl CapabilitiesMatching for SpecNewSessionParameters {
                             }
                         }
                         "acceptInsecureCerts" => {
-                            if value.as_boolean().unwrap_or(false) &&
-                                !browser_capabilities
-                                .accept_insecure_certs(merged)
-                                .unwrap_or(false) {
-                                return None;
-                            }
+                            !browser_capabilities
+                            .accept_insecure_certs(merged)
+                            .unwrap_or(false);
                         },
                         "proxy" => {
                             let default = BTreeMap::new();

From 3c8535f68f6125c9dc207cfc5b42f08bbb903acd Mon Sep 17 00:00:00 2001
From: AutomatedTester <david.burns@theautomatedtester.co.uk>
Date: Thu, 13 Apr 2017 18:56:56 +0100
Subject: [PATCH 3/3] fixup! Correct conditional check around
 `acceptsInsecureCerts`. Fixes #638

---
 src/capabilities.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/capabilities.rs b/src/capabilities.rs
index de8025e..2f5eab4 100644
--- a/src/capabilities.rs
+++ b/src/capabilities.rs
@@ -417,9 +417,11 @@ impl CapabilitiesMatching for SpecNewSessionParameters {
                             }
                         }
                         "acceptInsecureCerts" => {
-                            !browser_capabilities
-                            .accept_insecure_certs(merged)
-                            .unwrap_or(false);
+                            if browser_capabilities
+                                .accept_insecure_certs(merged)
+                                .unwrap_or(false) {
+                                    return None;
+                                }
                         },
                         "proxy" => {
                             let default = BTreeMap::new();