Fixed tests that were too sensitive to error text changes (#569)

* Fixed tests that were too sensitive to error text changes

Tests were red on 4.1 due to error texts changed in the server.
Make sure to only check for keywords that are very likely to exist in
the message.

* Different type of error returned for transaction timeout, support both

Author: Peter Wilhelmsson

test/bolt-v3.test.js

@@ -85,18 +85,21 @@ describe('#integration Bolt V3 API', () => {
     await tx.run('MATCH (n:Node) SET n.prop = 1') // lock dummy node but keep the transaction open
 
     // run a query in an auto-commit transaction with timeout and try to update the locked dummy node
-    await expectAsync(
-      session.run(
+    try {
+      await session.run(
         'MATCH (n:Node) SET n.prop = $newValue',
         { newValue: 2 },
         { timeout: 1 }
       )
-    ).toBeRejectedWith(
-      jasmine.objectContaining({
-        message: jasmine.stringMatching(/transaction has been terminated/)
-      })
-    )
-
+    } catch (e) {
+      // ClientError on 4.1 and later
+      if (
+        e.code != 'Neo.ClientError.Transaction.TransactionTimedOut' &&
+        e.code != 'Neo.TransientError.Transaction.LockClientStopped'
+      ) {
+        fail('Expected transaction timeout error but got: ' + e.code)
+      }
+    }
     await tx.rollback()
     await otherSession.close()
   })
@@ -175,13 +178,21 @@ describe('#integration Bolt V3 API', () => {
 
     // run a query in an explicit transaction with timeout and try to update the locked dummy node
     const tx = session.beginTransaction({ timeout: 1 })
-    await expectAsync(
-      tx.run('MATCH (n:Node) SET n.prop = $newValue', { newValue: 2 })
-    ).toBeRejectedWith(
-      jasmine.objectContaining({
-        message: jasmine.stringMatching(/transaction has been terminated/)
-      })
-    )
+    try {
+      await tx.run(
+        'MATCH (n:Node) SET n.prop = $newValue',
+        { newValue: 2 },
+        { timeout: 1 }
+      )
+    } catch (e) {
+      // ClientError on 4.1 and later
+      if (
+        e.code != 'Neo.ClientError.Transaction.TransactionTimedOut' &&
+        e.code != 'Neo.TransientError.Transaction.LockClientStopped'
+      ) {
+        fail('Expected transaction timeout error but got: ' + e.code)
+      }
+    }
 
     await otherTx.rollback()
     await otherSession.close()

test/rx/summary.test.js

@@ -627,7 +627,7 @@ describe('#integration-rx summary', () => {
     }
 
     const summary = await runnable
-      .run('EXPLAIN MATCH (n:ThisLabelDoesNotExist) RETURN n')
+      .run('EXPLAIN MATCH (n:ThisLabelDoesNotExistRx) RETURN n')
       .consume()
       .toPromise()
     expect(summary).toBeDefined()
@@ -636,14 +636,8 @@ describe('#integration-rx summary', () => {
     expect(summary.notifications[0].code).toBe(
       'Neo.ClientNotification.Statement.UnknownLabelWarning'
     )
-    expect(summary.notifications[0].title).toBe(
-      'The provided label is not in the database.'
-    )
-    expect(summary.notifications[0].description).toBe(
-      "One of the labels in your query is not available in the database, make sure you didn't misspell it or that" +
-        ' the label is available when you run this statement in your application (the missing label name is:' +
-        ' ThisLabelDoesNotExist)'
-    )
+    expect(summary.notifications[0].title).toContain('label')
+    expect(summary.notifications[0].description).toContain('label')
     expect(summary.notifications[0].severity).toBe('WARNING')
   }
 

test/session.test.js

@@ -312,9 +312,7 @@ describe('#integration session', () => {
       expect(sum.notifications[0].code).toBe(
         'Neo.ClientNotification.Statement.UnknownLabelWarning'
       )
-      expect(sum.notifications[0].title).toBe(
-        'The provided label is not in the database.'
-      )
+      expect(sum.notifications[0].title).toContain('label')
       expect(sum.notifications[0].position.column).toBeGreaterThan(0)
       done()
     })