Update: add regression tests for Git.spawn env issues (#3759)

BYK · bestander · commit cd26fec502f0 · 2017-06-29T14:16:06.000-07:00
* Update: add regression tests for Git.spawn env issues **Summary** Regression tests for #3742 and follow up to #3743. **Test plan** Tests shall pass. * Fix CircleCI tests where process.env needs to be overridden * Don't use unnecessary braces and return statements
diff --git a/__tests__/util/git.js b/__tests__/util/git.js
@@ -1,6 +1,9 @@
 /* @flow */
 
+jest.mock('../../src/util/child.js');
+
 import Git from '../../src/util/git.js';
+import {spawn} from '../../src/util/child.js';
 import {NoopReporter} from '../../src/reporters/index.js';
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000;
@@ -76,6 +79,10 @@ test('secureGitUrl', async function(): Promise<void> {
   const reporter = new NoopReporter();
 
   let hasException = false;
+  (Git: any).repoExists = jest.fn();
+  Git.repoExists.mockImplementation(() => Promise.resolve(true)).mockImplementationOnce(() => {
+    throw new Error('Non-existent repo!');
+  });
   try {
     await Git.secureGitUrl(Git.npmUrlToGitUrl('http://fake-fake-fake-fake.com/123.git'), '', reporter);
   } catch (e) {
@@ -121,3 +128,16 @@ de43f4a993d1e08cd930ee22ecb2bac727f53449  refs/tags/v0.21.0-pre`),
     'v0.21.0-pre': 'de43f4a993d1e08cd930ee22ecb2bac727f53449',
   });
 });
+
+test('spawn', () => {
+  const spawnMock = (spawn: any).mock;
+
+  Git.spawn(['status']);
+
+  expect(spawnMock.calls[0][2].env).toMatchObject({
+    ...process.env,
+    GIT_ASKPASS: '',
+    GIT_TERMINAL_PROMPT: 0,
+    GIT_SSH_COMMAND: 'ssh -oBatchMode=yes',
+  });
+});
diff --git a/src/util/__mocks__/child.js b/src/util/__mocks__/child.js
@@ -0,0 +1,7 @@
+/* @flow */
+
+const realChild = (require: any).requireActual('./child.js');
+
+realChild.spawn = jest.fn(() => Promise.resolve(''));
+
+module.exports = realChild;
