Merge branch '1.0' into 1.1

Zhen Li · Zhen Li · commit 53f6758dcf8b · 2016-09-29T14:23:40.000+02:00
diff --git a/test/internal/tls.test.js b/test/internal/tls.test.js
@@ -80,7 +80,7 @@ describe('trust-signed-certificates', function() {
     driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
       encrypted: true,
       trust: "TRUST_SIGNED_CERTIFICATES",
-      trustedCertificates: ["build/neo4j/certificates/neo4j.cert", "test/resources/random.certificate"]
+      trustedCertificates: ["build/neo4j/certificates/neo4j.cert", "build/neo4j/certificates/neo4j.cert"]
     });
 
     // When
