Fix issues after merge conflicts.

Author: oskarhane

src/v1/internal/ch-node.js

@@ -137,9 +137,8 @@ const TrustStrategy = {
           " the signing certificate, or the server certificate, to the list of certificates trusted by this driver" +
           " using `neo4j.v1.driver(.., { trustedCertificates:['path/to/certificate.crt']}). This " +
           " is a security measure to protect against man-in-the-middle attacks. If you are just trying " +
-          " Neo4j out and are not concerned about encryption, simply disable it using `encrypted=\"" + ENCRYPTION_OFF +
-          "\"` in the driver" +
-          " options. Socket responded with: " + socket.authorizationError));
+          " Neo4j out and are not concerned about encryption, simply disable it using `encrypted=\"" + ENCRYPTION_OFF + "\"`" +
+          " in the driver options. Socket responded with: " + socket.authorizationError));
       } else {
         onSuccess();
       }
@@ -161,8 +160,8 @@ const TrustStrategy = {
           " the signing certificate, or the server certificate, to the list of certificates trusted by this driver" +
           " using `neo4j.v1.driver(.., { trustedCertificates:['path/to/certificate.crt']}). This " +
           " is a security measure to protect against man-in-the-middle attacks. If you are just trying " +
-          " Neo4j out and are not concerned about encryption, simply disable it using `encrypted=false` in the driver" +
-          " options."));
+          " Neo4j out and are not concerned about encryption, simply disable it using `encrypted=\"" + ENCRYPTION_OFF + "\"`" +
+          " in the driver options. Socket responded with: " + socket.authorizationError));
       } else {
         onSuccess();
       }

src/v1/internal/ch-websocket.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 import {debug} from "./log";
 import {HeapBuffer} from "./buf";
 import {newError} from './../error';
@@ -46,14 +46,14 @@ class WebSocketChannel {
     let scheme = "ws";
     //Allow boolean for backwards compatibility
     if( opts.encrypted === true || opts.encrypted === ENCRYPTION_ON ||
-       (opts.encrypted === ENCRYPTION_NON_LOCAL && !isLocalHost(opts.host)) ||
-       opts.trust === "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES" ) {
+      (opts.encrypted === ENCRYPTION_NON_LOCAL && !isLocalHost(opts.host)) ) {
+      if((!opts.trust) || opts.trust === "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES" ) {
         scheme = "wss";
       } else {
         this._error = newError("The browser version of this driver only supports one trust " +
           "strategy, 'TRUST_CUSTOM_CA_SIGNED_CERTIFICATES'. "+opts.trust+" is not supported. Please " +
           "either use TRUST_CUSTOM_CA_SIGNED_CERTIFICATES or disable encryption by setting " +
-          "`encrypted:\"" + ENCRYPTION_OFF + "\"` in the driver configuration.");
+          "`encrypted:\"ENCRYPTION_OFF\"` in the driver configuration.");
         return;
       }
     }
@@ -81,7 +81,7 @@ class WebSocketChannel {
       if( self.onmessage ) {
         var b = new HeapBuffer( event.data );
         self.onmessage( b );
-      } 
+      }
     };
 
     this._ws.onerror = this._handleConnectionError;
@@ -103,7 +103,7 @@ class WebSocketChannel {
       }
     }
   }
-  
+
   isEncrypted() {
     return this._encrypted;
   }

test/v1/tck/steps/tlssteps.js

@@ -155,7 +155,7 @@ module.exports = function () {
       "certificate, or the server certificate, to the list of certificates trusted by this driver using " +
       "`neo4j.v1.driver(.., { trustedCertificates:['path/to/certificate.crt']}). This  is a security measure to protect " +
       "against man-in-the-middle attacks. If you are just trying  Neo4j out and are not concerned about encryption, " +
-      "simply disable it using `encrypted=\"ENCRYPTION_OFF\"` in the driver options.";
+      "simply disable it using `encrypted=\"ENCRYPTION_OFF\"` in the driver options. Socket responded with: DEPTH_ZERO_SELF_SIGNED_CERT";
     if (this.error.message !== expected) {
       callback(new Error("Given and expected results does not match: " + this.error.message + " Expected " + expected));
     } else {