Skip to content

Commit 1a2822e

Browse files
authored
Merge branch 'master' into bring-types
2 parents 6e2ce45 + 53ff893 commit 1a2822e

File tree

4 files changed

+87
-33
lines changed

4 files changed

+87
-33
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ module.exports = {
1212
'testing-library/no-dom-import': 'off',
1313
'testing-library/prefer-screen-queries': 'off',
1414
'testing-library/no-manual-cleanup': 'off',
15+
'testing-library/no-await-sync-events': 'off',
16+
'testing-library/await-fire-event': 'error',
1517
},
1618
}

.github/workflows/validate.yml

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: validate
2+
on:
3+
push:
4+
branches:
5+
[
6+
'+([0-9])?(.{+([0-9]),x}).x',
7+
'master',
8+
'next',
9+
'next-major',
10+
'beta',
11+
'alpha',
12+
'!all-contributors/**',
13+
]
14+
pull_request:
15+
branches-ignore: ['all-contributors/**']
16+
jobs:
17+
main:
18+
strategy:
19+
matrix:
20+
node: [10.13, 12, 14, 15]
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: ⬇️ Checkout repo
24+
uses: actions/checkout@v2
25+
26+
- name: ⎔ Setup node
27+
uses: actions/setup-node@v1
28+
with:
29+
node-version: ${{ matrix.node }}
30+
31+
- name: 📥 Download deps
32+
uses: bahmutov/npm-install@v1
33+
with:
34+
useLockFile: false
35+
36+
- name: ▶️ Run validate script
37+
run: npm run validate
38+
39+
- name: ⬆️ Upload coverage report
40+
uses: codecov/codecov-action@v1
41+
42+
release:
43+
needs: main
44+
runs-on: ubuntu-latest
45+
if:
46+
${{ github.repository == 'testing-library/vue-testing-library' &&
47+
contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha',
48+
github.ref) && github.event_name == 'push' }}
49+
steps:
50+
- name: ⬇️ Checkout repo
51+
uses: actions/checkout@v2
52+
53+
- name: ⎔ Setup node
54+
uses: actions/setup-node@v1
55+
with:
56+
node-version: 14
57+
58+
- name: 📥 Download deps
59+
uses: bahmutov/npm-install@v1
60+
with:
61+
useLockFile: false
62+
63+
- name: 🏗 Run build script
64+
run: npm run build
65+
66+
- name: 🚀 Release
67+
uses: cycjimmy/semantic-release-action@v2
68+
with:
69+
semantic_version: 17
70+
branches: |
71+
[
72+
'+([0-9])?(.{+([0-9]),x}).x',
73+
'master',
74+
'next',
75+
'next-major',
76+
{name: 'beta', prerelease: true},
77+
{name: 'alpha', prerelease: true}
78+
]
79+
env:
80+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.travis.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
[![GitHub version][github-badge]][github]
3333
[![npm version][npm-badge]][npm]
3434
[![Discord][discord-badge]][discord]
35-
3635
[![MIT License][license-badge]][license]
3736
<!-- prettier-ignore-end -->
3837

@@ -69,7 +68,7 @@ npm install --save-dev @testing-library/vue
6968
This library has `peerDependencies` listings for `Vue` and
7069
`vue-template-compiler`.
7170

72-
You may also be interested in installing `jest-dom` so you can use [the custom
71+
You may also be interested in installing `@testing-library/jest-dom` so you can use [the custom
7372
Jest matchers][jest-dom].
7473

7574
## A basic example
@@ -123,7 +122,7 @@ test('increments value on click', async () => {
123122
})
124123
```
125124

126-
> You might want to install [`jest-dom`][jest-dom] to add handy assertions such
125+
> You might want to install [`@testing-library/jest-dom`][jest-dom] to add handy assertions such
127126
> as `.toBeInTheDocument()`. In the example above, you could write
128127
> `expect(screen.queryByText('Times clicked: 0')).toBeInTheDocument()`.
129128
@@ -237,8 +236,8 @@ instead of filing an issue on GitHub.
237236
[![cilice](https://avatars2.githubusercontent.com/u/835588?v=3&s=120)](https://github.com/cilice)
238237

239238
<!-- prettier-ignore-start -->
240-
[build-badge]: https://travis-ci.org/testing-library/vue-testing-library.svg?branch=master
241-
[build]: https://travis-ci.org/testing-library/vue-testing-library
239+
[build-badge]: https://img.shields.io/github/workflow/status/testing-library/vue-testing-library/validate?logo=github
240+
[build]: https://github.com/testing-library/vue-testing-library/actions?query=workflow%3Avalidate
242241
[coverage-badge]: https://img.shields.io/codecov/c/github/testing-library/vue-testing-library.svg
243242
[coverage]: https://codecov.io/github/testing-library/vue-testing-library
244243
[github-badge]: https://badge.fury.io/gh/testing-library%2Fvue-testing-library.svg

0 commit comments

Comments
 (0)