From f2bca59e8fdf47677a2d110f45aa84d8fb218438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Thu, 18 Jun 2015 17:50:30 -0700 Subject: cache: some remote specs aren't URLs; don't break Fixes #8031 PR-URL: https://github.com/npm/npm/pull/8673 --- test/tap/add-remote-git-get-resolved.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/tap/add-remote-git-get-resolved.js b/test/tap/add-remote-git-get-resolved.js index 4a4f0a5fe..d66929b65 100644 --- a/test/tap/add-remote-git-get-resolved.js +++ b/test/tap/add-remote-git-get-resolved.js @@ -74,9 +74,16 @@ test('add-remote-git#get-resolved HTTPS', function (t) { test('add-remote-git#get-resolved edge cases', function (t) { var getResolved = require('../../lib/cache/add-remote-git.js').getResolved - t.notOk( - getResolved('git@bananaboat.com:galbi.git', 'decadacefadabade'), - 'non-hosted Git SSH non-URI strings are invalid' + t.equal( + getResolved('git+ssh://user@bananaboat.com:galbi/blah.git', 'decadacefadabade'), + 'git+ssh://user@bananaboat.com:galbi/blah.git#decadacefadabade', + 'don\'t break non-hosted scp-style locations' + ) + + t.equal( + getResolved('git+ssh://bananaboat:galbi/blah', 'decadacefadabade'), + 'git+ssh://bananaboat:galbi/blah#decadacefadabade', + 'don\'t break non-hosted scp-style locations' ) t.equal( @@ -85,17 +92,17 @@ test('add-remote-git#get-resolved edge cases', function (t) { 'don\'t break non-hosted SSH URLs' ) + t.equal( + getResolved('git+ssh://git.bananaboat.net:/foo', 'decadacefadabade'), + 'git+ssh://git.bananaboat.net:/foo#decadacefadabade', + 'don\'t break non-hosted SSH URLs' + ) + t.equal( getResolved('git://gitbub.com/foo/bar.git', 'decadacefadabade'), 'git://gitbub.com/foo/bar.git#decadacefadabade', 'don\'t break non-hosted git: URLs' ) - t.comment('test for https://github.com/npm/npm/issues/3224') - t.equal( - getResolved('git+ssh://git@git.example.com:my-repo.git#9abe82cb339a70065e75300f62b742622774693c', 'decadacefadabade'), - 'git+ssh://git@git.example.com:my-repo.git#decadacefadabade', - 'preserve weird colon in semi-standard ssh:// URLs' - ) t.end() }) -- cgit v1.2.3