Skip to content

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

Merged
bestander merged 3 commits intomasterfrom
git-test
Jun 29, 2017
Merged

Update: add regression tests for Git.spawn env issues#3759
bestander merged 3 commits intomasterfrom
git-test

Conversation

@BYK
Copy link
Copy Markdown
Member

@BYK BYK commented Jun 29, 2017

Summary

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

Test plan

Tests shall pass.

Update: add regression tests for Git.spawn env issues
2f1b3ce 
**Summary**

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

**Test plan**

Tests shall pass.
@BYK BYK requested review from arcanis, bestander and cpojer June 29, 2017 16:56
cpojer
cpojer reviewed Jun 29, 2017
View reviewed changes
Comment thread src/util/__mocks__/child.js Outdated

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

realChild.spawn = jest.fn(() => {
Copy link
Copy Markdown
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

@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
Copy Markdown
Member

bestander commented Jun 30, 2017 •
edited
Loading

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
Copy Markdown
Member

bestander commented Jun 30, 2017

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
Revert "Update: add regression tests for Git.spawn env issues (#3759)"
3257cdf 
This reverts commit cd26fec.
@bestander bestander mentioned this pull request Jun 30, 2017
Merged
bestander added a commit that referenced this pull request Jun 30, 2017
@bestander
Revert "Update: add regression tests for Git.spawn env issues" (#3768)
de7bef4 
* 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
Closed
3 tasks
BYK pushed a commit that referenced this pull request Jun 30, 2017
Update: add regression tests for Git.spawn env issues
8e127d4 
**Summary**

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

**Test plan**

Tests shall pass, mocks shall not pass.
@BYK BYK mentioned this pull request Jun 30, 2017
Merged
BYK pushed a commit that referenced this pull request Jun 30, 2017
Update: add regression tests for Git.spawn env issues
5199493 
**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
@BYK @bestander
Update: add regression tests for Git.spawn env issues (#3772)
4d5dcc6 
* 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

Reviewers

@arcanis arcanis Awaiting requested review from arcanis

@bestander bestander Awaiting requested review from bestander

1 more reviewer

@cpojer cpojer cpojer approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@BYK @bestander @cpojer