improve sequelize instantiation test

Author: kukoo

test/specs/models/sequelize.spec.ts

@@ -1,7 +1,7 @@
 /* tslint:disable:max-classes-per-file */
 
 import {expect} from 'chai';
-import {createSequelize, createSequelizeUriObject, createSequelizeUriString} from "../../utils/sequelize";
+import {createSequelize} from "../../utils/sequelize";
 import {Game} from "../../models/exports/Game";
 import Gamer from "../../models/exports/gamer.model";
 import {Sequelize} from "../../../lib/models/Sequelize";
@@ -11,6 +11,14 @@ import {Table} from '../../../lib/annotations/Table';
 describe('sequelize', () => {
 
   const sequelize = createSequelize(false);
+  const connectionUri = "sqlite://root@localhost/__";
+
+  function testOptionsProp(instance: Sequelize): void {
+    expect(instance).to.have.property('options').that.have.property('dialect').that.eqls('sqlite');
+    expect(instance).to.have.property('config').that.have.property('host').that.eqls('localhost');
+    expect(instance).to.have.property('config').that.have.property('database').that.eqls('__');
+    expect(instance).to.have.property('config').that.have.property('username').that.eqls('root');
+  }
 
   describe('constructor', () => {
 
@@ -20,22 +28,70 @@ describe('sequelize', () => {
 
   });
 
+  describe('constructor: using "name" property as a db name', () => {
+
+    const db = '__';
+    const sequelizeDbName = new Sequelize({
+      name: db,
+      dialect: 'sqlite',
+      username: 'root',
+      password: '',
+      storage: ':memory:',
+      logging: !('SEQ_SILENT' in process.env)
+    });
+
+    it('should equal Sequelize class', () => {
+      expect(sequelizeDbName.constructor).to.equal(Sequelize);
+    });
+
+    it('should contain database property, which equal to db.', () => {
+      expect(sequelizeDbName)
+        .to.have.property('config')
+        .that.have.property('database')
+        .that.eqls(db);
+    });
+
+  });
+
   describe('constructor using uri in options object', () => {
 
-    const sequelizeUri = createSequelizeUriString(false);
+    const sequelizeUri = new Sequelize({
+      uri: connectionUri,
+      storage: ':memory:',
+      logging: !('SEQ_SILENT' in process.env),
+      pool: {max: 8, min: 0}
+    });
+
     it('should equal Sequelize class', () => {
       expect(sequelizeUri.constructor).to.equal(Sequelize);
     });
 
+    it('should contain valid options extracted from connection string', () => {
+      testOptionsProp(sequelizeUri);
+    });
+
+    it('should contain additional Sequelize options', () => {
+      expect(sequelizeUri)
+        .to.have.property('options')
+        .to.have.property('pool')
+        .that.have.property('max')
+        .that.eqls(8);
+    });
+
   });
 
   describe('constructor using uri string', () => {
 
-    const sequelizeUri = createSequelizeUriObject(false);
+    const sequelizeUri = new Sequelize(connectionUri);
+
     it('should equal Sequelize class', () => {
       expect(sequelizeUri.constructor).to.equal(Sequelize);
     });
 
+    it('should contain valid options extracted from connection string', () => {
+      testOptionsProp(sequelizeUri);
+    });
+
   });
 
   describe('global define options', () => {

test/utils/sequelize.ts

@@ -16,23 +16,6 @@ export function createSequelize(useModelsInPath: boolean = true, define: DefineO
   });
 }
 
-export function createSequelizeUriObject(useModelsInPath: boolean = true, define: DefineOptions<any> = {}): Sequelize {
-
-  return new Sequelize({
-    uri: 'sqlite://root@localhost/__',
-    dialect: 'sqlite',
-    define,
-    storage: ':memory:',
-    logging: !('SEQ_SILENT' in process.env),
-    modelPaths: useModelsInPath ? [__dirname + '/../models'] : []
-  });
-}
-
-export function createSequelizeUriString(useModelsInPath: boolean = true, define: DefineOptions<any> = {}): Sequelize {
-
-  return new Sequelize("sqlite://root@localhost/__");
-}
-
 export function createSequelizeValidationOnly(useModelsInPath: boolean = true): Sequelize {
 
   return new Sequelize({