Merge pull request #1245 from saschagehlich/bugfix/customeventemitter-fix

Fix CustomEventEmitter

lib/emitters/custom-event-emitter.js

@@ -36,12 +36,26 @@ module.exports = (function() {
       // No error listener
       // No error listener
       var er = arguments[1];
       var er = arguments[1];
 
 
+      // If error argument is an object but no error,
+      // boil it down to the value of the first key
+      // (probably an Array in most cases)
+      if (Utils._.isObject(er) && !(er instanceof Error)) {
+        er = er[Object.keys(er)[0]]
+      }
+
       // If error argument is an array, make sure we
       // If error argument is an array, make sure we
       // pass only the first error to the original
       // pass only the first error to the original
       // .emit() function of EventEmitter
       // .emit() function of EventEmitter
       if (er instanceof Array) {
       if (er instanceof Array) {
-        arguments[1] = Utils._.flatten(er)[0]
+        er = Utils._.flatten(er)[0]
       }
       }
+
+      // We don't want to throw strings. Make them Errors!
+      if (typeof er === "string") {
+        er = new Error(er)
+      }
+
+      arguments[1] = er
     }
     }
 
 
     EventEmitter.prototype.emit.apply(this, arguments);
     EventEmitter.prototype.emit.apply(this, arguments);

test/dao.test.js

@@ -710,7 +710,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
       })
       })
     })
     })
 
 
-    it("gets triggered if everything was ok", function(done) {
+    it("gets triggered if everything was ok", function(done) {
       this.User.count().complete(function(err, result) {
       this.User.count().complete(function(err, result) {
         expect(err).to.be.null
         expect(err).to.be.null
         expect(result).to.exist
         expect(result).to.exist

test/emitters/custom-event-emitter.test.js

@@ -102,4 +102,22 @@ describe(Support.getTestDialectTeaser("CustomEventEmitter"), function () {
       })
       })
     })
     })
   })
   })
+
+  describe("when emitting an error event with a hash containing arrays of error strings", function() {
+    describe("if no error handler is given", function() {
+      it("should throw an error with the first error string", function(done) {
+        var emitter = new CustomEventEmitter()
+        var errors = {
+          myValidation: [ "Invalid Length" ],
+          someOtherValidation: [ "Naah don't like that value!", "It's weird, u know?" ]
+        }
+
+        expect(function () {
+          emitter.emit("error", errors)
+        }).to.throw(errors.myValidation[0])
+
+        done()
+      })
+    })
+  })
 })
 })