Merge remote-tracking branch 'upstream/1.0' into 1.1

Author: pontusmelke

lib/browser/neo4j-web.js

@@ -28235,7 +28235,7 @@ function connect(url) {
     host: host(url),
     port: port(url) || 7687,
     // Default to using encryption if trust-on-first-use is available
-    encrypted: config.encrypted || (0, _features2["default"])("trust_on_first_use"),
+    encrypted: config.encrypted == null ? (0, _features2["default"])("trust_on_first_use") : config.encrypted,
     // Default to using trust-on-first-use if it is available
     trust: config.trust || ((0, _features2["default"])("trust_on_first_use") ? "TRUST_ON_FIRST_USE" : "TRUST_SIGNED_CERTIFICATES"),
     trustedCertificates: config.trustedCertificates || [],
@@ -28284,7 +28284,7 @@ var FEATURES = {
       // that supports reading the whole certificate, eg this commit:
       // https://github.com/nodejs/node/commit/345c40b6
       var desc = require('tls').TLSSocket.prototype.getPeerCertificate;
-      return desc.length() >= 1;
+      return desc.length >= 1;
     } catch (e) {
       return false;
     }

lib/browser/neo4j-web.min.js

@@ -490,7 +490,7 @@ function connect(url) {
     host: host(url),
     port: port(url) || 7687,
     // Default to using encryption if trust-on-first-use is available
-    encrypted: config.encrypted || (0, _features2["default"])("trust_on_first_use"),
+    encrypted: config.encrypted == null ? (0, _features2["default"])("trust_on_first_use") : config.encrypted,
     // Default to using trust-on-first-use if it is available
     trust: config.trust || ((0, _features2["default"])("trust_on_first_use") ? "TRUST_ON_FIRST_USE" : "TRUST_SIGNED_CERTIFICATES"),
     trustedCertificates: config.trustedCertificates || [],

lib/browser/neo4j-web.test.js

@@ -32,7 +32,7 @@ var FEATURES = {
       // that supports reading the whole certificate, eg this commit:
       // https://github.com/nodejs/node/commit/345c40b6
       var desc = require('tls').TLSSocket.prototype.getPeerCertificate;
-      return desc.length() >= 1;
+      return desc.length >= 1;
     } catch (e) {
       return false;
     }

lib/v1/internal/connector.js

@@ -423,7 +423,7 @@ function connect( url, config = {}) {
     host: host(url),
     port: port(url) || 7687,
     // Default to using encryption if trust-on-first-use is available
-    encrypted : config.encrypted || hasFeature("trust_on_first_use"),
+    encrypted : (config.encrypted == null) ?  hasFeature("trust_on_first_use") : config.encrypted,
     // Default to using trust-on-first-use if it is available
     trust : config.trust || (hasFeature("trust_on_first_use") ? "TRUST_ON_FIRST_USE" : "TRUST_SIGNED_CERTIFICATES"),
     trustedCertificates : config.trustedCertificates || [],

lib/v1/internal/features.js

@@ -27,7 +27,7 @@ const FEATURES = {
       // that supports reading the whole certificate, eg this commit:
       // https://github.com/nodejs/node/commit/345c40b6
       let desc = require('tls').TLSSocket.prototype.getPeerCertificate;
-      return desc.length() >= 1;
+      return desc.length >= 1;
     } catch( e ) {
       return false;
     }

src/v1/internal/connector.js

@@ -76,7 +76,7 @@ describe('connector', function() {
 
   it('should provide error message when connecting to http-port', function(done) {
     // Given
-    var conn = connect("bolt://localhost:7474");
+    var conn = connect("bolt://localhost:7474", {encrypted:false});
 
     // When
     conn.initialize( "mydriver/0.0.0", {scheme: "basic", principal: "neo4j", credentials: "neo4j"},  {