enable more ITs for connection-channel

Author: bigmontz

src/internal/connection-channel.js

@@ -39,15 +39,16 @@ export function createChannelConnection (
   config,
   errorHandler,
   log,
-  serversideRouting = null
+  serversideRouting = null,
+  createChannel = channelConfig => new Channel(channelConfig)
 ) {
   const channelConfig = new ChannelConfig(
     address,
     config,
     errorHandler.errorCode()
   )
 
-  const channel = new Channel(channelConfig)
+  const channel = createChannel(channelConfig)
 
   return Bolt.handshake(channel)
     .then(({ protocolVersion: version, consumeRemainingBuffer }) => {

test/internal/connection-channel.test.js

@@ -133,30 +133,34 @@ describe('#integration ChannelConnection', () => {
       })
   })
 
-  xit('should convert failure messages to errors', done => {
+  it('should convert failure messages to errors', done => {
     const channel = new DummyChannel()
-    connection = new ChannelConnection(
-      channel,
-      new ConnectionErrorHandler(SERVICE_UNAVAILABLE),
-      ServerAddress.fromUrl('localhost:7687'),
-      Logger.noOp()
-    )
-
-    connection._negotiateProtocol()
-
     const errorCode = 'Neo.ClientError.Schema.ConstraintValidationFailed'
     const errorMessage =
       'Node 0 already exists with label User and property "email"=[john@doe.com]'
 
-    connection._queueObserver({
-      onError: error => {
-        expectNeo4jError(error, errorCode, errorMessage)
-        done()
-      }
-    })
+    createChannelConnection(
+      ServerAddress.fromUrl('localhost:7687'),
+      {},
+      new ConnectionErrorHandler(SERVICE_UNAVAILABLE),
+      Logger.noOp(),
+      null,
+      () => channel
+    )
+      .then(connection => {
+        connection._queueObserver({
+          onCompleted: done.fail.bind(done),
+          onComplete: done.fail.bind(done),
+          onError: error => {
+            expectNeo4jError(error, errorCode, errorMessage)
+            done()
+          }
+        })
+        channel.onmessage(packedFailureMessage(errorCode, errorMessage))
+      })
+      .catch(done.fail.bind(done))
 
     channel.onmessage(packedHandshakeMessage())
-    channel.onmessage(packedFailureMessage(errorCode, errorMessage))
   })
 
   it('should notify when connection initialization completes', async done => {
@@ -361,7 +365,7 @@ describe('#integration ChannelConnection', () => {
       .catch(done.fail.bind(done))
   })
 
-  xit('should handle and transform fatal errors', done => {
+  it('should handle and transform fatal errors', done => {
     const errors = []
     const addresses = []
     const transformedError = newError('Message', 'Code')
@@ -374,24 +378,25 @@ describe('#integration ChannelConnection', () => {
       }
     )
 
-    connection = ChannelConnection.create(
+    createChannelConnection(
       ServerAddress.fromUrl(`bolt://${sharedNeo4j.hostname}`),
       {},
       errorHandler,
       Logger.noOp()
     )
-
-    connection._queueObserver({
-      onError: error => {
-        expect(error).toEqual(transformedError)
-        expect(errors.length).toEqual(1)
-        expect(errors[0].code).toEqual(SERVICE_UNAVAILABLE)
-        expect(addresses).toEqual([connection.address])
-        done()
-      }
-    })
-
-    connection._handleFatalError(newError('Hello', SERVICE_UNAVAILABLE))
+      .then(connection => {
+        connection._queueObserver({
+          onError: error => {
+            expect(error).toEqual(transformedError)
+            expect(errors.length).toEqual(1)
+            expect(errors[0].code).toEqual(SERVICE_UNAVAILABLE)
+            expect(addresses).toEqual([connection.address])
+            done()
+          }
+        })
+        connection._handleFatalError(newError('Hello', SERVICE_UNAVAILABLE))
+      })
+      .catch(done.fail.bind(done))
   })
 
   it('should send INIT/HELLO and GOODBYE messages', async () => {