test: fix existing openHandles issues (#534)

Author: arnaud-moncel

.travis.yml

@@ -18,7 +18,7 @@ jobs:
       script: commitlint-travis
     - script: yarn lint
       name: Lint JavaScript
-    - script: sleep 20; yarn test:coverage --forceExit
+    - script: sleep 20; yarn test:coverage
       name: Tests
       # NOTICE: Handles code coverage reporting to Code Climate
       before_install:

test/adapters/sequelize.test.js

@@ -6,7 +6,8 @@ function getField(schema, name) {
   return schema.fields.find((field) => field.field === name);
 }
 
-[sequelizePostgres, sequelizeMySQLMin, sequelizeMySQLMax].forEach((sequelize) => {
+[sequelizePostgres, sequelizeMySQLMin, sequelizeMySQLMax].forEach((connectionManager) => {
+  const sequelize = connectionManager.createConnection();
   const models = {};
   const sequelizeOptions = {
     sequelize: Sequelize,
@@ -24,7 +25,7 @@ function getField(schema, name) {
     },
   });
 
-  describe(`with dialect ${sequelize.options.dialect} (port: ${sequelize.options.port})`, () => {
+  describe(`with dialect ${connectionManager.getDialect()} (port: ${connectionManager.getPort()})`, () => {
     describe('with model `users`', () => {
       it('should set name correctly', async () => {
         expect.assertions(1);

test/databases.js

@@ -1,27 +1,40 @@
 const Sequelize = require('sequelize');
 
-const databaseOptions = {
-  logging: false,
-  pool: { maxConnections: 10, minConnections: 1 },
-};
+class ConnectionManager {
+  constructor(connectionString) {
+    this.connectionString = connectionString;
+    this.databaseOptions = {
+      logging: false,
+      pool: { maxConnections: 10, minConnections: 1 },
+    };
+    this.connection = null;
+  }
+
+  getDialect() {
+    return this.connection && this.connection.options && this.connection.options.dialect;
+  }
 
-const sequelizePostgres = new Sequelize(
-  'postgres://forest:secret@localhost:5436/forest-express-sequelize-test',
-  databaseOptions,
-);
+  getPort() {
+    return this.connection && this.connection.options && this.connection.options.port;
+  }
 
-const sequelizeMySQLMin = new Sequelize(
-  'mysql://forest:secret@localhost:8998/forest-express-sequelize-test',
-  databaseOptions,
-);
+  createConnection() {
+    if (!this.connection) {
+      this.connection = new Sequelize(this.connectionString, this.databaseOptions);
+    }
+    return this.connection;
+  }
 
-const sequelizeMySQLMax = new Sequelize(
-  'mysql://forest:secret@localhost:8999/forest-express-sequelize-test',
-  databaseOptions,
-);
+  closeConnection() {
+    if (this.connection) {
+      this.connection.close();
+      this.connection = null;
+    }
+  }
+}
 
 module.exports = {
-  sequelizePostgres,
-  sequelizeMySQLMin,
-  sequelizeMySQLMax,
+  sequelizePostgres: new ConnectionManager('postgres://forest:secret@localhost:5436/forest-express-sequelize-test'),
+  sequelizeMySQLMin: new ConnectionManager('mysql://forest:secret@localhost:8998/forest-express-sequelize-test'),
+  sequelizeMySQLMax: new ConnectionManager('mysql://forest:secret@localhost:8999/forest-express-sequelize-test'),
 };