From 53fa3bc1849032cf082abdd7cb4f87a165b9302e Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 5 Jun 2023 14:07:43 -0700 Subject: [PATCH] chore: fix opts test if test env has askpass or ssh command --- test/opts.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/test/opts.js b/test/opts.js index 32951ab..6d21c84 100644 --- a/test/opts.js +++ b/test/opts.js @@ -1,14 +1,22 @@ const t = require('tap') const gitOpts = require('../lib/opts.js') -const gitEnv = { - GIT_ASKPASS: 'echo', - GIT_SSH_COMMAND: 'ssh -oStrictHostKeyChecking=accept-new', -} -t.match(gitOpts().env, gitEnv, 'got the git defaults we want') - -t.equal(gitOpts().shell, false, 'shell defaults to false') -t.equal(gitOpts({ shell: '/bin/bash' }).shell, false, 'shell cannot be overridden') +t.test('defaults', t => { + const { GIT_ASKPASS, GIT_SSH_COMMAND } = process.env + t.teardown(() => { + process.env.GIT_ASKPASS = GIT_ASKPASS + process.env.GIT_SSH_COMMAND = GIT_SSH_COMMAND + }) + delete process.env.GIT_ASKPASS + delete process.env.GIT_SSH_COMMAND + t.match(gitOpts().env, { + GIT_ASKPASS: 'echo', + GIT_SSH_COMMAND: 'ssh -oStrictHostKeyChecking=accept-new', + }, 'got the git defaults we want') + t.equal(gitOpts().shell, false, 'shell defaults to false') + t.equal(gitOpts({ shell: '/bin/bash' }).shell, false, 'shell cannot be overridden') + t.end() +}) t.test('does not override', t => { const { GIT_ASKPASS, GIT_SSH_COMMAND } = process.env