Change so that driver is not closed after each test

Closing the driver, shuts down all connections which creates a noice in the server logs.

Author: pontusmelke

test/internal/tls.test.js

@@ -25,10 +25,10 @@ var hasFeature = require("../../lib/v1/internal/features");
 describe('trust-signed-certificates', function() {
 
   var driver;
-  var log = console.log
+  var log = console.log;
   beforeEach(function() {
     console.log = function () {}; // To mute deprecation message in test output
-  })
+  });
   it('should reject unknown certificates', function(done) {
     // Assuming we only run this test on NodeJS
     if( !NodeChannel.available ) {

test/v1/tck/steps/authsteps.js

@@ -26,28 +26,36 @@ module.exports = function () {
   var password = "password";
 
   this.Given(/^a driver is configured with auth enabled and correct password is provided$/, function () {
-    this.driver.close();
+    if (this.driver) {
+      this.driver.close();
+    }
     this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
   });
 
   this.Then(/^reading and writing to the database should be possible$/, function (callback) {
-    var session = this.driver.session()
+    var session = this.driver.session();
     session.run("CREATE (:label1)").then( function(  ) {
         callback();
     }).catch(function(err) {callback(new Error("Rejected Promise: " + err))});
   });
 
   this.Given(/^a driver is configured with auth enabled and the wrong password is provided$/, function () {
-    this.driver.close();
+    if (this.driver) {
+      this.driver.close();
+    }
     this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "wrong"));
+    this.driver.session();
   });
 
-  this.Then(/^reading and writing to the database should not be possible$/, function (callback) {
-   this.driver.onError = function(err) {
-     self.err = err;
-   };
-    var session = this.driver.session();
+  this.Then(/^reading and writing to the database should not be possible$/, {timeout:5000}, function (callback) {
+
     var self = this;
+    this.driver.onError = function (err) {
+      self.err = err;
+      callback();
+    };
+
+    var session = this.driver.session();
     session.run("CREATE (:label1)").then( function(  ) {
       callback(new Error("Should not be able to run session!"));
     }).catch( function(err) {

test/v1/tck/steps/environment.js

@@ -22,25 +22,34 @@ var fs = require("fs");
 
 module.exports = function () {
 
+  var driver = undefined;
+
   var failedScenarios = [];
 
+  this.registerHandler("BeforeFeatures", function(event, next) {
+    driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
+
+    return next()
+  });
+
   this.Before("@reset_database", function( scenario, callback ) {
-    this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
+    this.driver = driver;
     this.session = this.driver.session();
     this.session.run("MATCH (n) DETACH DELETE n").then( function( ) {
       callback();
     });
   });
 
   this.Before("@tls", function( scenario ) {
+
     this.knownHosts1 = "known_hosts1";
     this.knownHosts2 = "known_hosts2";
     _deleteFile(this.knownHosts1);
     _deleteFile(this.knownHosts2);
   });
 
   this.Before("~@reset_database", "~@tls", function( scenario, callback ) {
-    this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
+    this.driver = driver;
     this.session = this.driver.session();
     callback();
   });
@@ -50,8 +59,8 @@ module.exports = function () {
   });
 
   this.After(function (scenario, callback) {
-    if (this.driver) {
-      this.driver.close();
+    if (this.session) {
+      this.session.close();
     }
     if (!scenario.isSuccessful()) {
       failedScenarios.push(scenario)
@@ -63,6 +72,9 @@ module.exports = function () {
   });
 
   this.registerHandler('AfterFeatures', function (event, callback) {
+    if (driver) {
+      driver.close();
+    }
     if (failedScenarios.length) {
       for ( var i = 0; i < failedScenarios.length; i++) {
         console.log("FAILED! Scenario: " + failedScenarios[i].getName());

test/v1/tck/steps/erroreportingsteps.js

@@ -57,22 +57,23 @@ module.exports = function () {
   });
 
   this.When(/^I run a non valid cypher statement$/, function (callback) {
-    self = this;
+    var self = this;
     this.session.run("CRETE (:n)").then(function(result) {callback()}).catch(function(err) {self.error = err.fields[0]; callback()})
   });
 
   this.When(/^I set up a driver to an incorrect port$/, function (callback) {
-    self = this;
-    driver = neo4j.driver("bolt://localhost:7777", neo4j.auth.basic("neo4j", "neo4j"));
-    driver.session();
+    var self = this;
+    var driver = neo4j.driver("bolt://localhost:7777", neo4j.auth.basic("neo4j", "neo4j"));
     driver.onError = function (error) { self.error = error; callback()};
+    driver.session();
   });
 
   this.When(/^I set up a driver with wrong scheme$/, function (callback) {
-    self = this;
-    driver = neo4j.driver("wrong://localhost:7474", neo4j.auth.basic("neo4j", "neo4j"));
+    var self = this;
+    var driver = neo4j.driver("wrong://localhost:7474", neo4j.auth.basic("neo4j", "neo4j"));
     driver.session();
     driver.onError = function (error) { self.error = error; callback()};
+    driver.close();
   });
 
-}
+};

test/v1/tck/steps/tlssteps.js

@@ -51,7 +51,7 @@ module.exports = function () {
     callback();
   });
 
-  this.Then(/^creating sessions should fail$/, function (callback) {
+  this.Then(/^creating sessions should fail$/,  {timeout: CALLBACK_TIMEOUT}, function (callback) {
     var session = this.driver1.session();
     var self = this;
     session.run("RETURN 1")