Fixes #665

lib/dao.js

@@ -365,20 +365,22 @@ module.exports = (function() {
       }
     }
 
-    if (this.__options.timestamps && isNewRecord) {
-      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = Utils.now()
-      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = Utils.now()
-
-      if (this.__options.paranoid) {
-        defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
-      }
-
+    if (isNewRecord) {
       if (this.hasDefaultValues) {
         Utils._.each(this.defaultValues, function(valueFn, key) {
           if (!defaults.hasOwnProperty(key))
             defaults[key] = valueFn()
         })
       }
+
+      if (this.__options.timestamps) {
+        defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = Utils.now()
+        defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = Utils.now()
+
+        if (this.__options.paranoid) {
+          defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
+        }
+      }
     }
 
     if (Utils._.size(defaults)) {

spec/dao-factory.spec.js

@@ -7,6 +7,7 @@ if(typeof require === 'function') {
 }
 
 buster.spec.expose()
+buster.testRunner.timeout = 1000
 
 describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
   before(function(done) {
@@ -124,6 +125,21 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       expect(Task.build().flag).toEqual(false)
     })
 
+    it("fills the objects with default values", function() {
+      var Task = this.sequelize.define('Task', {
+        title:  {type: Sequelize.STRING, defaultValue: 'a task!'},
+        foo:    {type: Sequelize.INTEGER, defaultValue: 2},
+        bar:    {type: Sequelize.DATE},
+        foobar: {type: Sequelize.TEXT, defaultValue: 'asd'},
+        flag:   {type: Sequelize.BOOLEAN, defaultValue: false}
+      }, { timestamps: false })
+      expect(Task.build().title).toEqual('a task!')
+      expect(Task.build().foo).toEqual(2)
+      expect(Task.build().bar).toEqual(undefined)
+      expect(Task.build().foobar).toEqual('asd')
+      expect(Task.build().flag).toEqual(false)
+    })
+
     it("stores the the passed values in a special variable", function() {
       var user = this.User.build({ username: 'John Wayne' })
       expect(user.selectedValues).toEqual({ username: 'John Wayne' })

spec/dao.spec.js

@@ -6,6 +6,7 @@ if (typeof require === 'function') {
 }
 
 buster.spec.expose()
+buster.testRunner.timeout = 1000
 
 describe(Helpers.getTestDialectTeaser("DAO"), function() {
   before(function(done) {

spec/dao.validations.spec.js

@@ -6,6 +6,7 @@ if(typeof require === 'function') {
 }
 
 buster.spec.expose()
+buster.testRunner.timeout = 1000
 
 describe(Helpers.getTestDialectTeaser("DaoValidator"), function() {
   describe('validations', function() {