Fix expectation to work with 4.0

Author: ali-ince

gulpfile.babel.js

@@ -181,25 +181,37 @@ gulp.task('run-browser-test', function(cb){
 gulp.task('run-browser-test-chrome', function(cb){
   new karmaServer({
     configFile: __dirname + '/test/browser/karma-chrome.conf.js',
-  }, cb).start();
+    singleRun: true,
+  }, function (exitCode) {
+    exitCode ? process.exit(exitCode) : cb();
+  }).start();
 });
 
 gulp.task('run-browser-test-firefox', function(cb){
   new karmaServer({
     configFile: __dirname + '/test/browser/karma-firefox.conf.js',
-  }, cb).start();
+    singleRun: true,
+  }, function (exitCode) {
+    exitCode ? process.exit(exitCode) : cb();
+  }).start();
 });
 
 gulp.task('run-browser-test-edge', function(cb){
   new karmaServer({
     configFile: __dirname + '/test/browser/karma-edge.conf.js',
-  }, cb).start();
+    singleRun: true,
+  }, function (exitCode) {
+    exitCode ? process.exit(exitCode) : cb();
+  }).start();
 });
 
 gulp.task('run-browser-test-ie', function (cb) {
   new karmaServer({
     configFile: __dirname + '/test/browser/karma-ie.conf.js',
-  }, cb).start();
+    singleRun: true,
+  }, function (exitCode) {
+    exitCode ? process.exit(exitCode) : cb();
+  }).start();
 });
 
 gulp.task('watch', function () {

test/internal/http/http-driver.test.js

@@ -30,6 +30,8 @@ describe('http driver', () => {
   let serverVersion;
 
   beforeEach(async () => {
+    jasmine.addMatchers(testUtils.matchers);
+
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
 
@@ -253,7 +255,7 @@ describe('http driver', () => {
       } catch (error) {
         failed = true;
         expect(error.name).toEqual('Neo4jError');
-        expect(error.code).toEqual('Neo.DatabaseError.Statement.ExecutionFailed');
+        expect(error.code).toBeElementOf(['Neo.DatabaseError.Statement.ExecutionFailed', 'Neo.TransientError.Transaction.LockClientStopped']);
         expect(error.message.indexOf('transaction has been terminated')).not.toBeLessThan(0);
       }
 

test/internal/test-utils.js

@@ -30,8 +30,31 @@ function fakeStandardDateWithOffset(offsetMinutes) {
   return date;
 }
 
+const matchers = {
+  toBeElementOf: function (util, customEqualityTesters) {
+    return {
+      compare: function(actual, expected) {
+        if (expected === undefined) {
+          expected = [];
+        }
+
+        let result = {};
+
+        result.pass = util.contains(expected, actual);
+        if (result.pass) {
+          result.message = `Expected '${actual}' to be an element of '[${expected}]'`;
+        } else {
+          result.message = `Expected '${actual}' to be an element of '[${expected}]', but it wasn't`;
+        }
+        return result;
+      }
+    }
+  }
+};
+
 export default {
   isClient,
   isServer,
-  fakeStandardDateWithOffset
+  fakeStandardDateWithOffset,
+  matchers
 };