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

Author: pontusmelke

runTests.sh

@@ -7,4 +7,5 @@ trap finish EXIT
 
 npm install
 npm run start-neo4j
+sleep 2
 npm test

src/v1/internal/connector.js

@@ -203,8 +203,11 @@ class Connection {
         if( buf.hasRemaining() ) {
           self._dechunker.write(buf.readSlice( buf.remaining() ));
         }
-
-      } else {
+      } else if (proposed == 1213486160) {//server responded 1213486160 == 0x48545450 == "HTTP"
+        self._handleFatalError(newError("Server responded HTTP. Make sure you are not trying to connect to the http endpoint " +
+          "(HTTP defaults to port 7474 whereas BOLT defaults to port 7687)"));
+      }
+      else {
         self._handleFatalError(newError("Unknown Bolt protocol version: " + proposed));
       }
     };

test/internal/connector.test.js

@@ -74,4 +74,25 @@ describe('connector', function() {
     done();
   });
 
+  it('should provide error message when connecting to http-port', function(done) {
+    // Given
+    var conn = connect("bolt://localhost:7474");
+
+    // When
+    conn.initialize( "mydriver/0.0.0", {scheme: "basic", principal: "neo4j", credentials: "neo4j"},  {
+      onCompleted: function( msg ) {
+      },
+      onError: function(err) {
+        //only node gets the pretty error message
+        if( require('../../lib/v1/internal/ch-node.js').available ) {
+          expect(err.message).toBe("Server responded HTTP. Make sure you are not trying to connect to the http endpoint " +
+            "(HTTP defaults to port 7474 whereas BOLT defaults to port 7687)");
+        }
+        done();
+      }
+    });
+    conn.sync();
+
+  });
+
 });

test/v1/examples.test.js

@@ -130,7 +130,7 @@ describe('examples', function() {
     setTimeout(function() {
       expect(out[0]).toBe("There were 1 the ones created.");
       done();
-    }, 500)
+    }, 1000)
   });
 
   it('should be able to iterate results', function(done) {
@@ -159,7 +159,7 @@ describe('examples', function() {
     setTimeout(function() {
       expect(out[0]).toBe("Sword in the stone");
       done();
-    }, 500);
+    }, 1000);
   });
 
   it('should be able to access records', function(done) {
@@ -194,7 +194,7 @@ describe('examples', function() {
     setTimeout(function() {
       expect(out[0].length).toBe(3);
       done();
-    }, 500)
+    }, 1000)
   });
 
   it('should be able to retain for later processing', function(done) {
@@ -226,7 +226,7 @@ describe('examples', function() {
     setTimeout(function() {
       expect(out[0]).toBe("Lancelot is a knight of Camelot");
       done();
-    }, 500);
+    }, 1000);
   });
 
   it('should be able to do nested queries', function(done) {
@@ -262,7 +262,7 @@ describe('examples', function() {
     setTimeout(function() {
       expect(out[0]).toBe("Count is 1");
       done();
-    }, 500);
+    }, 1000);
   });
 
   it('should be able to handle cypher error', function(done) {
@@ -295,7 +295,7 @@ describe('examples', function() {
     setTimeout(function() {
       expect(out.length).toBe(1);
       done();
-    }, 500);
+    }, 1000);
   });
 
   it('should be able to see notifications', function(done) {
@@ -315,7 +315,7 @@ describe('examples', function() {
     setTimeout(function () {
       expect(out[0]).toBe("Neo.ClientNotification.Statement.CartesianProductWarning");
       done();
-    }, 500);
+    }, 1000);
   });
 
   it('should document committing a transaction', function() {

test/v1/tck/steps/tlssteps.js

@@ -15,7 +15,7 @@ module.exports = function () {
     callback();
   });
 
-  this.Then(/^sessions should simply work$/, function (callback) {
+  this.Then(/^sessions should simply work$/, {timeout: 60 * 1000},  function (callback) {
     var session = this.driver1.session();
     session.run("RETURN 1").then(function (result) {
       session.close();