diff options
| -rw-r--r-- | lib/help.js | 2 | ||||
| -rw-r--r-- | test/lib/help.js | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/lib/help.js b/lib/help.js index b9ff1c957..589819eb0 100644 --- a/lib/help.js +++ b/lib/help.js @@ -9,7 +9,7 @@ const BaseCommand = require('./base-command.js') // Strips out the number from foo.7 or foo.7. or foo.7.tgz // We don't currently compress our man pages but if we ever did this would // seemlessly continue supporting it -const manNumberRegex = /\.(\d+)(\..*)?$/ +const manNumberRegex = /\.(\d+)(\.[^/\\]*)?$/ class Help extends BaseCommand { /* istanbul ignore next - see test/lib/load-all-commands.js */ diff --git a/test/lib/help.js b/test/lib/help.js index ccf13a7e4..b5fe297b5 100644 --- a/test/lib/help.js +++ b/test/lib/help.js @@ -340,3 +340,26 @@ test('npm help - man viewer propagates errors', t => { t.end() }) }) + +test('npm help with complex installation path finds proper help file', t => { + npmConfig.viewer = 'browser' + globResult = [ + 'C:/Program Files/node-v14.15.5-win-x64/node_modules/npm/man/man1/npm-install.1', + // glob always returns forward slashes, even on Windows + ] + + t.teardown(() => { + npmConfig.viewer = undefined + globResult = globDefaults + spawnBin = null + spawnArgs = null + }) + + return help.exec(['1', 'install'], (err) => { + if (err) + throw err + + t.match(openUrlArg, /commands(\/|\\)npm-install.html$/, 'attempts to open the correct url') + t.end() + }) +}) |