Skip to content
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.

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

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

Merged
merged 3 commits into from
Jun 29, 2017
Merged

Conversation

BYK
Copy link
Member

@BYK BYK commented Jun 29, 2017

Summary

Regression tests for #3742 and follow up to #3743.

Test plan

Tests shall pass.

**Summary**

Regression tests for #3742 and follow up to #3743.

**Test plan**

Tests shall pass.
@BYK BYK requested review from cpojer, arcanis and bestander June 29, 2017 16:56

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

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

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

@bestander bestander merged commit cd26fec into master Jun 29, 2017
@BYK BYK deleted the git-test branch June 29, 2017 22:42
@bestander
Copy link
Member

bestander commented Jun 30, 2017

src/utils/__mocks__/child.js gets compiled into lib on build, I wonder if it affects Yarn in any way.

Also jest complains

jest-haste-map: duplicate manual mock found:
Module name: child
Duplicate Mock path: /Users/bestander/work/temp/yarn/lib/util/mocks/child.js
This warning is caused by two manual mock files with the same file name.
Jest will use the mock file found in:
/Users/bestander/work/temp/yarn/lib/util/mocks/child.js
Please delete one of the following two files:
/Users/bestander/work/temp/yarn/src/util/mocks/child.js
/Users/bestander/work/temp/yarn/lib/util/mocks/child.js

jest-haste-map: duplicate manual mock found:
Module name: child
Duplicate Mock path: /Users/bestander/work/temp/yarn/lib-legacy/util/mocks/child.js
This warning is caused by two manual mock files with the same file name.
Jest will use the mock file found in:
/Users/bestander/work/temp/yarn/lib-legacy/util/mocks/child.js
Please delete one of the following two files:
/Users/bestander/work/temp/yarn/lib/util/mocks/child.js
/Users/bestander/work/temp/yarn/lib-legacy/util/mocks/child.js

@bestander
Copy link
Member

I'll revert this one for today

@bestander bestander restored the git-test branch June 30, 2017 04:26
bestander added a commit that referenced this pull request Jun 30, 2017
bestander added a commit that referenced this pull request Jun 30, 2017
* Revert "Fix: emoji should default to true on darwin platforms (#3766)"

This reverts commit 69574f6.

* Revert "Support for ~ (home dir) in path configurations (#3756)"

This reverts commit 35ee7de.

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

This reverts commit cd26fec.
@bestander bestander mentioned this pull request Jun 30, 2017
3 tasks
BYK pushed a commit that referenced this pull request Jun 30, 2017
**Summary**

Regression tests for #3742 and follow up to #3743 and #3759.

**Test plan**

Tests shall pass, mocks shall not pass.
BYK pushed a commit that referenced this pull request Jun 30, 2017
**Summary**

Regression tests for #3742 and follow up to #3743 and #3759.

**Test plan**

Tests shall pass, mocks shall not pass.
bestander pushed a commit that referenced this pull request Jun 30, 2017
* Update: add regression tests for Git.spawn env issues

**Summary**

Regression tests for #3742 and follow up to #3743 and #3759.

**Test plan**

Tests shall pass, mocks shall not pass.

* Import from the right place
@cpojer cpojer deleted the git-test branch July 7, 2017 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants