diff options
Diffstat (limited to 'deps/npm/test/tap/bitbucket-shortcut.js')
-rw-r--r-- | deps/npm/test/tap/bitbucket-shortcut.js | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/deps/npm/test/tap/bitbucket-shortcut.js b/deps/npm/test/tap/bitbucket-shortcut.js index a708d84972..f8167fdd2d 100644 --- a/deps/npm/test/tap/bitbucket-shortcut.js +++ b/deps/npm/test/tap/bitbucket-shortcut.js @@ -1,4 +1,7 @@ 'use strict' + +const BB = require('bluebird') + var fs = require('graceful-fs') var path = require('path') @@ -25,21 +28,20 @@ test('setup', function (t) { test('bitbucket-shortcut', function (t) { var cloneUrls = [ ['https://bitbucket.org/foo/private.git', 'Bitbucket shortcuts try HTTPS URLs first'], - ['git@bitbucket.org:foo/private.git', 'Bitbucket shortcuts try SSH second'] + ['ssh://git@bitbucket.org/foo/private.git', 'Bitbucket shortcuts try SSH second'] ] var npm = requireInject.installGlobally('../../lib/npm.js', { - 'child_process': { - 'execFile': function (cmd, args, options, cb) { - process.nextTick(function () { - if (args.indexOf('clone') === -1) return cb(null, '', '') + 'pacote/lib/util/git': { + 'revs': (repo, opts) => { + return BB.resolve().then(() => { var cloneUrl = cloneUrls.shift() if (cloneUrl) { - t.is(args[args.length - 2], cloneUrl[0], cloneUrl[1]) + t.is(repo, cloneUrl[0], cloneUrl[1]) } else { t.fail('too many attempts to clone') } - cb(new Error('execFile mock fails on purpose')) + throw new Error('git.revs mock fails on purpose') }) } } @@ -53,8 +55,8 @@ test('bitbucket-shortcut', function (t) { } npm.load(opts, function (er) { t.ifError(er, 'npm loaded without error') - npm.commands.install(['bitbucket:foo/private'], function (er) { - t.ok(er, 'mocked install failed as expected') + npm.commands.install(['bitbucket:foo/private'], function (err) { + t.match(err.message, /mock fails on purpose/, 'mocked install failed as expected') t.end() }) }) |