fix: Address regressions due to changes in node

nodejs · May 16, 2019 · 0fba6a0 · 0fba6a0
1 parent 1d94012
commit 0fba6a0
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/lib/internal/inspect_repl.js b/lib/internal/inspect_repl.js
@@ -25,6 +25,7 @@ const Path = require('path');
 const Repl = require('repl');
 const util = require('util');
 const vm = require('vm');
+const fileURLToPath = require('url').fileURLToPath;
 
 const debuglog = util.debuglog('inspect');
 
@@ -89,9 +90,12 @@ function isNativeUrl(url) {
   return url.replace('.js', '') in NATIVES || url === 'bootstrap_node.js';
 }
 
-function getRelativePath(filename) {
+function getRelativePath(filenameOrURL) {
   const dir = Path.join(Path.resolve(), 'x').slice(0, -1);
 
+  const filename = filenameOrURL.startsWith('file://') ?
+    fileURLToPath(filenameOrURL) : filenameOrURL;
+
   // Change path to relative, if possible
   if (filename.indexOf(dir) === 0) {
     return filename.slice(dir.length);

diff --git a/test/cli/break.test.js b/test/cli/break.test.js
@@ -18,12 +18,12 @@ test('stepping through breakpoints', (t) => {
     .then(() => cli.waitForPrompt())
     .then(() => {
       t.match(
-        cli.output,
-        `break in ${script}:1`,
+        cli.breakInfo,
+        { filename: script, line: 1 },
         'pauses in the first line of the script');
       t.match(
         cli.output,
-        /> 1 \(function \([^)]+\) \{ const x = 10;/,
+        /> 1 (?:\(function \([^)]+\) \{ )?const x = 10;/,
         'shows the source and marks the current line');
     })
     .then(() => cli.stepCommand('n'))

diff --git a/test/cli/low-level.test.js b/test/cli/low-level.test.js
@@ -24,7 +24,7 @@ test('Debugger agent direct access', (t) => {
     .then(() => {
       t.match(
         cli.output,
-        /scriptSource: '\(function \(/);
+        /scriptSource:[ \n]*'\(function \(/);
       t.match(
         cli.output,
         /let x = 1;/);

diff --git a/test/cli/scripts.test.js b/test/cli/scripts.test.js
@@ -24,7 +24,7 @@ test('list scripts', (t) => {
         'lists the user script');
       t.notMatch(
         cli.output,
-        /\d+: module\.js <native>/,
+        /\d+: buffer\.js <native>/,
         'omits node-internal scripts');
     })
     .then(() => cli.command('scripts(true)'))
@@ -35,7 +35,7 @@ test('list scripts', (t) => {
         'lists the user script');
       t.match(
         cli.output,
-        /\d+: module\.js <native>/,
+        /\d+: buffer\.js <native>/,
         'includes node-internal scripts');
     })
     .then(() => cli.quit())

diff --git a/test/cli/start-cli.js b/test/cli/start-cli.js
@@ -108,6 +108,17 @@ function startCLI(args, flags = []) {
         });
     },
 
+    get breakInfo() {
+      const output = this.output;
+      const breakMatch =
+        output.match(/break (?:on start )in ([^\n]+):(\d+)\n/i);
+
+      if (breakMatch === null) {
+        throw new Error(`Could not find breakpoint info in ${output}`);
+      }
+      return { filename: breakMatch[1], line: +breakMatch[2] };
+    },
+
     ctrlC() {
       return this.command('.interrupt');
     },

diff --git a/test/cli/use-strict.test.js b/test/cli/use-strict.test.js
@@ -17,9 +17,10 @@ test('for whiles that starts with strict directive', (t) => {
   return cli.waitForInitialBreak()
     .then(() => cli.waitForPrompt())
     .then(() => {
+      const brk = cli.breakInfo;
       t.match(
-        cli.output,
-        /break in [^:]+:(?:1|2)[^\d]/,
+        `${brk.line}`,
+        /^(1|2)$/,
         'pauses either on strict directive or first "real" line');
     })
     .then(() => cli.quit())