Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 547677f

Browse files
committed
Merge master into better-docs
2 parents 1a89ecd + ad53fa7 commit 547677f

File tree

14 files changed

+2388
-4951
lines changed

14 files changed

+2388
-4951
lines changed

‎.all-contributorsrc‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projectName": "react-hooks-testing-library",
3-
"projectOwner": "mpeyper",
3+
"projectOwner": "testing-library",
44
"repoType": "github",
55
"repoHost": "https://github.com",
66
"files": [
@@ -92,6 +92,25 @@
9292
"contributions": [
9393
"doc"
9494
]
95+
},
96+
{
97+
"login": "mtinner",
98+
"name": "Marcel Tinner",
99+
"avatar_url": "https://avatars0.githubusercontent.com/u/5487448?v=4",
100+
"profile": "https://github.com/mtinner",
101+
"contributions": [
102+
"doc"
103+
]
104+
},
105+
{
106+
"login": "FredyC",
107+
"name": "Daniel K.",
108+
"avatar_url": "https://avatars0.githubusercontent.com/u/1096340?v=4",
109+
"profile": "https://github.com/FredyC",
110+
"contributions": [
111+
"bug",
112+
"code"
113+
]
95114
}
96115
],
97116
"commitConvention": "none"

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
77
* Please make sure that you are familiar with and follow the Code of Conduct for
88
this project (found in the CODE_OF_CONDUCT.md file).
9-
9+
1010
* If this issue is a bug, feature request or question, there are specific templates that can be used for those:
11-
https://github.com/mpeyper/react-hooks-testing-library/issues/new/choose
11+
https://github.com/testing-library/react-hooks-testing-library/issues/new/choose
1212
1313
-->
1414

‎.github/ISSUE_TEMPLATE/---bug-report.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: "Bugs, missing documentation, or unexpected behavior \U0001F914."
44
title: ''
55
labels: bug
66
assignees: ''
7-
87
---
98

109
<!--
@@ -21,15 +20,15 @@ assignees: ''
2120
-->
2221

2322
- `react-hooks-testing-library` version:
24-
- `react-testing-library` version:
23+
- `react-test-renderer` version:
2524
- `react` version:
2625
- `node` version:
2726
- `npm` (or `yarn`) version:
2827

2928
### Relevant code or config:
3029

3130
```js
32-
let your = (code, tell) => `the ${story}`;
31+
let your = (code, tell) => `the ${story}`
3332
```
3433

3534
### What you did:

‎CODE_OF_CONDUCT.md‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22

33
## Our Pledge
44

5-
In the interest of fostering an open and welcoming environment, we as
6-
contributors and maintainers pledge to making participation in our project and
7-
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, sex characteristics, gender identity and expression,
9-
level of experience, education, socio-economic status, nationality, personal
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers
6+
pledge to making participation in our project and our community a harassment-free experience for
7+
everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity
8+
and expression, level of experience, education, socio-economic status, nationality, personal
109
appearance, race, religion, or sexual identity and orientation.
1110

1211
## Our Standards
1312

14-
Examples of behavior that contributes to creating a positive environment
15-
include:
13+
Examples of behavior that contributes to creating a positive environment include:
1614

1715
- Using welcoming and inclusive language
1816
- Being respectful of differing viewpoints and experiences
@@ -22,53 +20,47 @@ include:
2220

2321
Examples of unacceptable behavior by participants include:
2422

25-
- The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
23+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
2724
- Trolling, insulting/derogatory comments, and personal or political attacks
2825
- Public or private harassment
29-
- Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
- Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
26+
- Publishing others' private information, such as a physical or electronic address, without explicit
27+
permission
28+
- Other conduct which could reasonably be considered inappropriate in a professional setting
3329

3430
## Our Responsibilities
3531

36-
Project maintainers are responsible for clarifying the standards of acceptable
37-
behavior and are expected to take appropriate and fair corrective action in
38-
response to any instances of unacceptable behavior.
32+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are
33+
expected to take appropriate and fair corrective action in response to any instances of unacceptable
34+
behavior.
3935

40-
Project maintainers have the right and responsibility to remove, edit, or
41-
reject comments, commits, code, wiki edits, issues, and other contributions
42-
that are not aligned to this Code of Conduct, or to ban temporarily or
43-
permanently any contributor for other behaviors that they deem inappropriate,
36+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
37+
code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or
38+
to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate,
4439
threatening, offensive, or harmful.
4540

4641
## Scope
4742

48-
This Code of Conduct applies both within project spaces and in public spaces
49-
when an individual is representing the project or its community. Examples of
50-
representing a project or community include using an official project e-mail
51-
address, posting via an official social media account, or acting as an appointed
52-
representative at an online or offline event. Representation of a project may be
43+
This Code of Conduct applies both within project spaces and in public spaces when an individual is
44+
representing the project or its community. Examples of representing a project or community include
45+
using an official project e-mail address, posting via an official social media account, or acting as
46+
an appointed representative at an online or offline event. Representation of a project may be
5347
further defined and clarified by project maintainers.
5448

5549
## Enforcement
5650

57-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
59-
complaints will be reviewed and investigated and will result in a response that
60-
is deemed necessary and appropriate to the circumstances. The project team is
61-
obligated to maintain confidentiality with regard to the reporter of an incident.
62-
Further details of specific enforcement policies may be posted separately.
51+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting
52+
the project team at [INSERT EMAIL ADDRESS]. All complaints will be reviewed and investigated and
53+
will result in a response that is deemed necessary and appropriate to the circumstances. The project
54+
team is obligated to maintain confidentiality with regard to the reporter of an incident. Further
55+
details of specific enforcement policies may be posted separately.
6356

64-
Project maintainers who do not follow or enforce the Code of Conduct in good
65-
faith may face temporary or permanent repercussions as determined by other
66-
members of the project's leadership.
57+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face
58+
temporary or permanent repercussions as determined by other members of the project's leadership.
6759

6860
## Attribution
6961

70-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
62+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at
63+
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
7264

7365
[homepage]: https://www.contributor-covenant.org
7466

‎CONTRIBUTING.md‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ Thanks for wanting to make contribution and wanting to improve this library for
1010

1111
## Add yourself as a contributor
1212

13-
This project follows the [all contributors](https://github.com/kentcdodds/all-contributors) specification. To
14-
add yourself to the table of contributors on the `README.md`, please use the
13+
This project follows the [all contributors](https://github.com/kentcdodds/all-contributors)
14+
specification. To add yourself to the table of contributors on the `README.md`, please use the
1515
automated script as part of your PR:
1616

1717
```console
1818
npm run contributors:add
1919
```
2020

21-
Follow the prompt and commit `.all-contributorsrc` and `README.md` in the PR. If
22-
you've already added yourself to the list and are making a new type of
23-
contribution, you can run it again and select the added contribution type.
21+
Follow the prompt and commit `.all-contributorsrc` and `README.md` in the PR. If you've already
22+
added yourself to the list and are making a new type of contribution, you can run it again and
23+
select the added contribution type.
2424

2525
## Committing and Pushing changes
2626

@@ -29,15 +29,14 @@ Please make sure to run the tests before you commit your changes. You can do so
2929

3030
### Add typings
3131

32-
If your PR introduced some changes in the API, you are more than welcome to
33-
modify the Typescript type definition to reflect those changes. Just modify the
34-
`index.d.ts` file accordingly. If you have never seen Typescript
35-
definitions before, you can read more about it in its
32+
If your PR introduced some changes in the API, you are more than welcome to modify the Typescript
33+
type definition to reflect those changes. Just modify the `index.d.ts` file accordingly. If you have
34+
never seen Typescript definitions before, you can read more about it in its
3635
[documentation pages](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html)
3736

3837
## Help needed
3938

40-
Please checkout the [the open issues](https://github.com/mpeyper/react-hooks-testing-library/issues)
39+
Please checkout the
40+
[the open issues](https://github.com/testing-library/react-hooks-testing-library/issues)
4141

42-
Also, please watch the repo and respond to questions/bug reports/feature
43-
requests! Thanks!
42+
Also, please watch the repo and respond to questions/bug reports/feature requests! Thanks!

‎LICENSE.md‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
The MIT License (MIT)
2-
Copyright (c) 2019 Michael Peyper
1+
The MIT License (MIT) Copyright (c) 2019 Michael Peyper
32

4-
Permission is hereby granted, free of charge, to any person obtaining a copy
5-
of this software and associated documentation files (the "Software"), to deal
6-
in the Software without restriction, including without limitation the rights
7-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
copies of the Software, and to permit persons to whom the Software is
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
4+
associated documentation files (the "Software"), to deal in the Software without restriction,
5+
including without limitation the rights to use, copy, modify, merge, publish, distribute,
6+
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
97
furnished to do so, subject to the following conditions:
108

11-
The above copyright notice and this permission notice shall be included in all
12-
copies or substantial portions of the Software.
9+
The above copyright notice and this permission notice shall be included in all copies or substantial
10+
portions of the Software.
1311

14-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-
SOFTWARE.
12+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
13+
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
14+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
15+
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
16+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /