From f79acdfb850d94f71a01970bff96337f52bb4e5a Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sun, 14 Nov 2021 23:58:56 -0800 Subject: [PATCH] [Tests] handle carriage returns in stack traces on Windows See https://github.com/substack/tape/pull/571#issuecomment-968173432 --- test/common.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/common.js b/test/common.js index eedc70ca..53ab4f83 100644 --- a/test/common.js +++ b/test/common.js @@ -45,7 +45,7 @@ var stripChangingData = function (line) { module.exports.stripFullStack = function (output) { var stripped = ' [... stack stripped ...]'; - var withDuplicates = output.split('\n').map(stripChangingData).map(function (line) { + var withDuplicates = output.split(/\r?\n/g).map(stripChangingData).map(function (line) { var m = line.match(/[ ]{8}at .*\((.*)\)/); if (m && m[1].slice(0, 5) !== '$TEST') { @@ -73,7 +73,7 @@ module.exports.stripFullStack = function (output) { 'at$1 $2' ).replace( // Handle stack trace variation in Node v0.8 - /(\[\.\.\. stack stripped \.\.\.\]\n *at) \(([^)]+)\)/g, + /(\[\.\.\. stack stripped \.\.\.\]\r?\n *at) \(([^)]+)\)/g, '$1 $2' - ).split('\n'); + ).split(/\r?\n/g); };