Fix bad message pulled from thrown strings

Fixes #871

Author: benvinegar

test/integration/test.js

@@ -256,6 +256,57 @@ describe('integration', function () {
             );
         });
 
+        it('should catch thrown strings', function (done) {
+            var iframe = this.iframe;
+
+            iframeExecute(iframe, done,
+                function () {
+                    // intentionally loading this error via a script file to make
+                    // sure it is 1) not caught by instrumentation 2) doesn't trigger
+                    // "Script error"
+                    var script = document.createElement('script');
+                    script.src = 'throw-string.js';
+                    script.onload = function () {
+                        done();
+                    };
+                    document.head.appendChild(script);
+                },
+                function () {
+                    var ravenData = iframe.contentWindow.ravenData[0];
+                    assert.match(ravenData.exception.values[0].value, /stringError$/);
+                    assert.equal(ravenData.exception.values[0].stacktrace.frames.length, 1);  // always 1 because thrown strings can't provide > 1 frame
+                    assert.match(ravenData.exception.values[0].stacktrace.frames[0].filename, /\/test\/integration\/throw-string\.js/)
+                    assert.match(ravenData.exception.values[0].stacktrace.frames[0]['function'], /\?|global code/);
+                }
+            );
+        });
+
+        it('should catch thrown errors', function (done) {
+            var iframe = this.iframe;
+
+            iframeExecute(iframe, done,
+                function () {
+                    // intentionally loading this error via a script file to make
+                    // sure it is 1) not caught by instrumentation 2) doesn't trigger
+                    // "Script error"
+                    var script = document.createElement('script');
+                    script.src = 'throw-error.js';
+                    script.onload = function () {
+                        done();
+                    };
+                    document.head.appendChild(script);
+                },
+                function () {
+                    var ravenData = iframe.contentWindow.ravenData[0];
+                    assert.match(ravenData.exception.values[0].type, /^Error/);
+                    assert.match(ravenData.exception.values[0].value, /realError$/);
+                    assert.isAbove(ravenData.exception.values[0].stacktrace.frames.length, 0); // 1 or 2 depending on platform
+                    assert.match(ravenData.exception.values[0].stacktrace.frames[0].filename, /\/test\/integration\/throw-error\.js/)
+                    assert.match(ravenData.exception.values[0].stacktrace.frames[0]['function'], /\?|global code/);
+                }
+            );
+        });
+
         it('should NOT catch an exception already caught via Raven.wrap', function (done) {
             var iframe = this.iframe;
 

test/integration/throw-error.js

@@ -0,0 +1,5 @@
+function throwRealError() {
+    throw new Error('realError');
+}
+
+throwRealError();

test/integration/throw-string.js

@@ -0,0 +1,5 @@
+function throwStringError() {
+    throw 'stringError';
+}
+
+throwStringError();

vendor/TraceKit/tracekit.js

@@ -26,7 +26,7 @@ var _slice = [].slice;
 var UNKNOWN_FUNCTION = '?';
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error#Error_types
-var ERROR_TYPES_RE = /^(?:Uncaught (?:exception: )?)?((?:Eval|Internal|Range|Reference|Syntax|Type|URI)Error): ?(.*)$/;
+var ERROR_TYPES_RE = /^(?:Uncaught (?:exception: )?)?((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): ?(.*)$/;
 
 function getLocationHref() {
     if (typeof document === 'undefined' || typeof document.location === 'undefined')
@@ -152,7 +152,11 @@ TraceKit.report = (function reportModuleWrapper() {
         if (lastExceptionStack) {
             TraceKit.computeStackTrace.augmentStackTraceWithInitialElement(lastExceptionStack, url, lineNo, message);
             processLastException();
-        } else if (ex) {
+        } else if (ex && typeof ex === 'object') {
+            // intentionally a "weak" object check here - want to accept
+            // Error-like objects just in case (previously *any* truthy ex value)
+            // triggered this branch
+
             // New chrome and blink send along a real error object
             // Let's just report that like a normal error.
             // See: https://mikewest.org/2013/08/debugging-runtime-errors-with-window-onerror
@@ -595,7 +599,6 @@ TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
                 throw e;
             }
         }
-
         return {
             'name': ex.name,
             'message': ex.message,