Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 29, 2017
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f1b3ce
Update: add regression tests for Git.spawn env issues
Jun 29, 2017
9519ad3
Fix CircleCI tests where process.env needs to be overridden
Jun 29, 2017
77dfcc9
Don't use unnecessary braces and return statements
Jun 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions __tests__/util/git.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
expect(spawnMock.calls[0][2].env).toMatchObject({
GIT_ASKPASS: '',
GIT_TERMINAL_PROMPT: 0,
GIT_SSH_COMMAND: 'ssh -oBatchMode=yes',
});
});
9 changes: 9 additions & 0 deletions src/util/__mocks__/child.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* @flow */

const realChild = (require: any).requireActual('./child.js');

realChild.spawn = jest.fn(() => {
Copy link
Contributor

@cpojer cpojer Jun 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you like braces and return statements so much? :P

return Promise.resolve('');
});

module.exports = realChild;