From 5ec8994fd803f852f79b89288be0328406d7fccb Mon Sep 17 00:00:00 2001 From: Anatoli Papirovski Date: Mon, 22 Jan 2018 12:12:38 -0500 Subject: [PATCH] test: fix a bug & lint issues in inspector-helper PR-URL: https://github.com/nodejs/node/pull/18293 Reviewed-By: Eugene Ostroukhov Reviewed-By: Luigi Pinca Reviewed-By: Guy Bedford --- test/common/inspector-helper.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/common/inspector-helper.js b/test/common/inspector-helper.js index 5e927f215055b9..52e9d01b87dd7e 100644 --- a/test/common/inspector-helper.js +++ b/test/common/inspector-helper.js @@ -5,9 +5,8 @@ const fs = require('fs'); const http = require('http'); const fixtures = require('../common/fixtures'); const { spawn } = require('child_process'); -const { URL, parse: parseURL } = require('url'); +const { parse: parseURL } = require('url'); const { getURLFromFilePath } = require('internal/url'); -const path = require('path'); const _MAINSCRIPT = fixtures.path('loop.js'); const DEBUG = false; @@ -173,7 +172,9 @@ class InspectorSession { const scriptId = script['scriptId']; const url = script['url']; this._scriptsIdsByUrl.set(scriptId, url); - if (getURLFromFilePath(url).toString() === this.scriptURL().toString()) { + const fileUrl = url.startsWith('file:') ? + url : getURLFromFilePath(url).toString(); + if (fileUrl === this.scriptURL().toString()) { this.mainScriptId = scriptId; } } @@ -246,8 +247,9 @@ class InspectorSession { const callFrame = message['params']['callFrames'][0]; const location = callFrame['location']; const scriptPath = this._scriptsIdsByUrl.get(location['scriptId']); - assert(scriptPath.toString() === expectedScriptPath.toString(), - `${scriptPath} !== ${expectedScriptPath}`); + assert.strictEqual(scriptPath.toString(), + expectedScriptPath.toString(), + `${scriptPath} !== ${expectedScriptPath}`); assert.strictEqual(line, location['lineNumber']); return true; }