Skip to content

fix: Add missing jest-dom prefix to config (fixes #10) #13

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

Merged

Conversation

nickserv
Copy link
Member

@nickserv nickserv commented Nov 4, 2019

No description provided.

@benmonro
Copy link
Member

benmonro commented Nov 4, 2019

@nickmccurdy looks like there's some conflicts, prob related to the revert I did here: #12

can you also make sure the docs that were reverted there are re-added?

@nickserv
Copy link
Member Author

nickserv commented Nov 4, 2019

I'm not sure what the easiest way around this is, since git doesn't know that I want to merge the old branch again even though master has reverted some of its commits. Should I revert #12 or rebase the original PR onto master again?

@benmonro
Copy link
Member

benmonro commented Nov 4, 2019 via email

@nickserv nickserv force-pushed the autogenerate-recommended-config branch 3 times, most recently from bccfece to 55a7618 Compare November 4, 2019 20:38
@nickserv nickserv force-pushed the autogenerate-recommended-config branch from 167ad83 to 10b5ac4 Compare November 4, 2019 20:43
@nickserv
Copy link
Member Author

nickserv commented Nov 4, 2019

I think I fixed the merge, so this should be working now. Should I add any specific Semantic Pull Request prefix?

@benmonro
Copy link
Member

benmonro commented Nov 4, 2019

@nickmccurdy yes please. i think fix: would work

@benmonro
Copy link
Member

benmonro commented Nov 4, 2019

i will have to test it later tonight though

@nickserv nickserv changed the title Add missing jest-dom prefix to config (fixes #10) fix: Add missing jest-dom prefix to config (fixes #10) Nov 4, 2019
@nickserv
Copy link
Member Author

nickserv commented Nov 5, 2019

Updated title

@benmonro benmonro merged commit ec23b96 into testing-library:master Nov 6, 2019
@benmonro
Copy link
Member

benmonro commented Nov 6, 2019

🎉 This PR is included in version 1.1.3 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants