feat: Treat ErrorEvents like Errors

Author: shcallaway

src/raven.js

@@ -8,7 +8,7 @@ var utils = require('./utils');
 var isError = utils.isError;
 var isObject = utils.isObject;
 var isObject = utils.isObject;
-var isError = utils.isError;
+var isErrorEvent = utils.isErrorEvent;
 var isUndefined = utils.isUndefined;
 var isFunction = utils.isFunction;
 var isString = utils.isString;
@@ -393,8 +393,12 @@ Raven.prototype = {
      * @return {Raven}
      */
   captureException: function(ex, options) {
-    // If not an Error is passed through, recall as a message instead
-    if (!isError(ex)) {
+    // Cases for sending ex as a message, rather than an exception
+    var isNotError = !isError(ex);
+    var isNotErrorEvent = !isErrorEvent(ex);
+    var isErrorEventWithoutError = isErrorEvent(ex) && !ex.error;
+
+    if ((isNotError && isNotErrorEvent) || isErrorEventWithoutError) {
       return this.captureMessage(
         ex,
         objectMerge(
@@ -407,6 +411,9 @@ Raven.prototype = {
       );
     }
 
+    // Get actual Error from ErrorEvent
+    if (isErrorEvent(ex)) ex = ex.error;
+
     // Store the raw exception object for potential debugging and introspection
     this._lastCapturedException = ex;
 

src/utils.js

@@ -22,6 +22,10 @@ function isError(value) {
   }
 }
 
+function isErrorEvent(value) {
+  return {}.toString.call(value) === '[object ErrorEvent]';
+}
+
 function isUndefined(what) {
   return what === void 0;
 }
@@ -348,6 +352,7 @@ function fill(obj, name, replacement, track) {
 module.exports = {
   isObject: isObject,
   isError: isError,
+  isErrorEvent: isErrorEvent,
   isUndefined: isUndefined,
   isFunction: isFunction,
   isString: isString,

test/raven.test.js

@@ -1739,7 +1739,7 @@ describe('globals', function() {
       this.sinon.stub(Raven, '_makeRequest');
       var stackInfo = {
         name: 'Error',
-        message: 'crap',
+        message: 'pickleRick',
         url: 'http://example.com',
         lineno: 10,
         stack: [
@@ -1774,7 +1774,7 @@ describe('globals', function() {
                 },
                 exception: {
                     type: 'Error',
-                    value: 'crap'
+                    value: 'pickleRick'
                 },
                 stacktrace: {
                     frames: [{
@@ -1798,7 +1798,7 @@ describe('globals', function() {
                     }]
                 },
                 culprit: 'http://example.com',
-                message: 'Error: crap',
+                message: 'Error: pickleRick',
                 foo: 'bar'
             }]);
             */
@@ -2347,7 +2347,7 @@ describe('Raven (public API)', function() {
     });
 
     it('should capture the exception with options', function() {
-      var error = new Error('crap');
+      var error = new Error('pickleRick');
       var broken = function() {
         throw error;
       };
@@ -2365,7 +2365,7 @@ describe('Raven (public API)', function() {
     });
 
     it('should capture the exception without options', function() {
-      var error = new Error('crap');
+      var error = new Error('pickleRick');
       var broken = function() {
         throw error;
       };
@@ -2770,24 +2770,47 @@ describe('Raven (public API)', function() {
   });
 
   describe('.captureException', function() {
+    it('should treat ErrorEvents similarly to Errors', function() {
+      var error = new ErrorEvent('pickleRick', {error: new Error('pickleRick')});
+      this.sinon.stub(Raven, 'isSetup').returns(true);
+      this.sinon.stub(Raven, '_handleStackInfo');
+      Raven.captureException(error, {foo: 'bar'});
+      assert.isTrue(Raven._handleStackInfo.calledOnce);
+    });
+
+    it('should send ErrorEvents without Errors as messages', function() {
+      var error = new ErrorEvent('pickleRick');
+      this.sinon.stub(Raven, 'isSetup').returns(true);
+      this.sinon.stub(Raven, 'captureMessage');
+      Raven.captureException(error, {foo: 'bar'});
+      assert.isTrue(Raven.captureMessage.calledOnce);
+    });
+
+    it('should send non-Errors as messages', function() {
+      this.sinon.stub(Raven, 'isSetup').returns(true);
+      this.sinon.stub(Raven, 'captureMessage');
+      Raven.captureException({}, {foo: 'bar'});
+      assert.isTrue(Raven.captureMessage.calledOnce);
+    });
+
     it('should call handleStackInfo', function() {
-      var error = new Error('crap');
+      var error = new Error('pickleRick');
       this.sinon.stub(Raven, 'isSetup').returns(true);
       this.sinon.stub(Raven, '_handleStackInfo');
       Raven.captureException(error, {foo: 'bar'});
       assert.isTrue(Raven._handleStackInfo.calledOnce);
     });
 
     it('should store the last exception', function() {
-      var error = new Error('crap');
+      var error = new Error('pickleRick');
       this.sinon.stub(Raven, 'isSetup').returns(true);
       this.sinon.stub(Raven, '_handleStackInfo');
       Raven.captureException(error);
       assert.equal(Raven.lastException(), error);
     });
 
     it("shouldn't reraise the if error is the same error", function() {
-      var error = new Error('crap');
+      var error = new Error('pickleRick');
       this.sinon.stub(Raven, 'isSetup').returns(true);
       this.sinon.stub(Raven, '_handleStackInfo').throws(error);
       // this would raise if the errors didn't match
@@ -2796,11 +2819,11 @@ describe('Raven (public API)', function() {
     });
 
     it('should reraise a different error', function() {
-      var error = new Error('crap1');
+      var error = new Error('pickleRick1');
       this.sinon.stub(Raven, 'isSetup').returns(true);
       this.sinon.stub(Raven, '_handleStackInfo').throws(error);
       assert.throws(function() {
-        Raven.captureException(new Error('crap2'));
+        Raven.captureException(new Error('pickleRick2'));
       }, error);
     });
 

test/utils.test.js

@@ -11,6 +11,7 @@ var isString = utils.isString;
 var isObject = utils.isObject;
 var isEmptyObject = utils.isEmptyObject;
 var isError = utils.isError;
+var isErrorEvent = utils.isErrorEvent;
 var wrappedCallback = utils.wrappedCallback;
 var joinRegExp = utils.joinRegExp;
 var objectMerge = utils.objectMerge;
@@ -65,6 +66,13 @@ describe('utils', function() {
     });
   });
 
+  describe('isErrorEvent', function() {
+    it('should work as advertised', function() {
+      assert.isFalse(isErrorEvent(new Error()));
+      assert.isTrue(isErrorEvent(new ErrorEvent('')));
+    });
+  });
+
   describe('isError', function() {
     function testErrorFromDifferentContext(createError) {
       var iframe = document.createElement('iframe');