Merge branch 'doneCbArgs' of https://github.com/janmeier/sequelize into janmeier-doneCbArgs

lib/emitters/custom-event-emitter.js

@@ -49,7 +49,7 @@ module.exports = (function() {
   function(fct) {
     fct = bindToProcess(fct);
     this.on('error', function(err) { fct(err, null) })
-        .on('success', function(result) { fct(null, result) })
+        .on('success', function(arg0, arg1) { fct(null, arg0, arg1) })
     return this
   }
 

test/dao-factory.test.js

@@ -355,7 +355,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         };
 
       this.User.create(data).success(function (user) {
-        self.User.findOrCreate(data).success(function (_user, created) {
+        self.User.findOrCreate(data).done(function (err, _user, created) {
           expect(_user.id).to.equal(user.id)
           expect(_user.username).to.equal('Username')
           expect(_user.data).to.equal('ThisIsData')