Merge pull request #11 from fabrix-app/v1.1

[chore] test model extending

lib/utils.ts

@@ -5,7 +5,7 @@ export const Utils = {
       return [...objValue, ...srcValue]
     }
   },
-  mergeConfig: (...values) => {
+  mergeConfig: (...values): {[key: string]: any} => {
     const config = {}
     values.forEach(val => {
       return mergeWith(config, val, Utils.mergeConfigUtil)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-sequelize",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Spool - Datastore Spool for Sequelize.js http://sequelizejs.com",
   "scripts": {
     "build": "tsc -p ./lib/tsconfig.release.json",

test/fixtures/app.js

@@ -3,6 +3,7 @@
 const _ = require('lodash')
 const smokesignals = require('smokesignals')
 const testModel = require('./testmodel')
+const testModel2 = require('./testmodel2')
 const SequelizeResolver = require('../../dist/index').SequelizeResolver
 
 const Model = require('@fabrix/fabrix/dist/common').FabrixModel
@@ -195,7 +196,8 @@ const App = {
           return SequelizeResolver
         }
       },
-      testModel
+      testModel,
+      testModel2
     }
   },
   config: {

test/fixtures/testmodel2.js

@@ -0,0 +1,34 @@
+const SequelizeResolver = require('../../dist/index').SequelizeResolver
+const Test = require('./testmodel')
+
+const Utils = require('../../dist/utils').Utils
+
+const TestResolver = class TestResolver extends SequelizeResolver {
+
+}
+
+module.exports = Test2 = class Test2 extends Test {
+  static config(app, Sequelize) {
+    return Utils.mergeConfig(Test.config(app, Sequelize), {
+      options: {}
+    })
+  }
+
+  static schema(app, Sequelize) {
+    return Utils.mergeConfig(Test.schema(app, Sequelize), {
+      name2: {type: Sequelize.STRING, allowNull: false}
+    })
+  }
+
+  static get resolver () {
+    return TestResolver
+  }
+
+  classLevelMethod() {
+    return 'foo'
+  }
+}
+
+Test2.prototype.instanceLevelMethod = function() {
+  return 'bar'
+}

test/integrations/spool.test.js

@@ -145,4 +145,18 @@ describe('Spool', () => {
     const instance = global.app.models.testModel.getTableName()
     done()
   })
+
+  describe('Model Extending', () => {
+    it('should create an instance of an extended model', (done) => {
+      const instance = global.app.models.testModel2.create({name: 'test', name2: 'test'})
+        .then(i => {
+          assert.equal(i.name, 'test')
+          assert.equal(i.name2, 'test')
+          done()
+        })
+        .catch(err => {
+          done(err)
+        })
+    })
+  })
 })