Skip to content

Attempt to parse error name when no 5th error arg (fixes #535) #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions test/vendor/tracekit.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ describe('TraceKit', function(){

describe('error notifications', function(){
var testMessage = "__mocha_ignore__";
var testLineNo = 1337;

var subscriptionHandler;
// TraceKit waits 2000ms for window.onerror to fire, so give the tests
// some extra time.
Expand All @@ -119,8 +121,8 @@ describe('TraceKit', function(){
// we can't do that without clobbering TraceKit's handler, which can only
// be installed once.
var oldOnError = window.onerror;
window.onerror = function(message) {
if (message == testMessage) {
window.onerror = function(message, url, lineNo) {
if (message == testMessage || lineNo === testLineNo) {
return true;
}
return oldOnError.apply(this, arguments);
Expand All @@ -134,6 +136,53 @@ describe('TraceKit', function(){
}
});

describe('with undefined arguments', function () {
it('should pass undefined:undefined', function () {
// this is probably not good behavior; just writing this test to verify
// that it doesn't change unintentionally
subscriptionHandler = function (stackInfo, extra) {
assert.equal(stackInfo.name, undefined);
assert.equal(stackInfo.message, undefined);
};
TraceKit.report.subscribe(subscriptionHandler);
window.onerror(undefined, undefined, testLineNo);
});
});
describe('when no 5th argument (error object)', function () {
it('should seperate name, message for default error types (e.g. ReferenceError)', function (done) {
subscriptionHandler = function (stackInfo, extra) {
assert.equal(stackInfo.name, 'ReferenceError');
assert.equal(stackInfo.message, 'foo is undefined');
};
TraceKit.report.subscribe(subscriptionHandler);
// should work with/without "Uncaught"
window.onerror('Uncaught ReferenceError: foo is undefined', 'http://example.com', testLineNo);
window.onerror('ReferenceError: foo is undefined', 'http://example.com', testLineNo)
done();
});

it('should ignore unknown error types', function (done) {
// TODO: should we attempt to parse this?
subscriptionHandler = function (stackInfo, extra) {
assert.equal(stackInfo.name, undefined);
assert.equal(stackInfo.message, 'CustomError: woo scary');
done();
};
TraceKit.report.subscribe(subscriptionHandler);
window.onerror('CustomError: woo scary', 'http://example.com', testLineNo);
});

it('should ignore arbitrary messages passed through onerror', function (done) {
subscriptionHandler = function (stackInfo, extra) {
assert.equal(stackInfo.name, undefined);
assert.equal(stackInfo.message, 'all work and no play makes homer: something something');
done();
};
TraceKit.report.subscribe(subscriptionHandler);
window.onerror('all work and no play makes homer: something something', 'http://example.com', testLineNo);
});
});

function testErrorNotification(collectWindowErrors, callOnError, numReports, done) {
var extraVal = "foo";
var numDone = 0;
Expand Down
18 changes: 17 additions & 1 deletion vendor/TraceKit/tracekit.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ var TraceKit = {
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 )?((?:Eval|Internal|Range|Reference|Syntax|Type|URI)Error)\: ?(.*)$/;

function getLocationHref() {
if (typeof document === 'undefined')
return '';
Expand Down Expand Up @@ -161,8 +164,21 @@ TraceKit.report = (function reportModuleWrapper() {
};
location.func = TraceKit.computeStackTrace.guessFunctionName(location.url, location.line);
location.context = TraceKit.computeStackTrace.gatherContext(location.url, location.line);

var name = undefined;
var msg = message; // must be new var or will modify original `arguments`
var groups;
if (isString(message)) {
var groups = message.match(ERROR_TYPES_RE);
if (groups) {
name = groups[1];
msg = groups[2];
}
}

stack = {
'message': message,
'name': name,
'message': msg,
'url': getLocationHref(),
'stack': [location]
};
Expand Down