Skip to content

Commit 9a49d22

Browse files
committed
Merge remote-tracking branch 'main/main'
2 parents 3be2a9c + 8d66009 commit 9a49d22

File tree

5 files changed

+21
-20
lines changed

5 files changed

+21
-20
lines changed

.github/workflows/validate.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: ${{ !contains(github.head_ref, 'all-contributors') }}
1717
strategy:
1818
matrix:
19-
node: [12, 14, 16]
19+
node: [12, 14, 16, 18]
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: 🛑 Cancel Previous Runs

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ cy.configureCypressTestingLibrary(config)
128128
```
129129

130130
To show some simple examples (from
131-
[cypress/integration/find.spec.js](cypress/integration/find.spec.js)):
131+
[cypress/e2e/find.cy.js](cypress/e2e/find.cy.js)):
132132

133133
```javascript
134134
cy.findAllByText('Button Text').should('exist')

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
"@testing-library/dom": "^8.1.0"
4545
},
4646
"devDependencies": {
47-
"cypress": "https://cdn.cypress.io/beta/npm/12.0.0/linux-x64/release/12.0.0-4db85d690e8439ef4d2397238ab069d557b2e818/cypress.tgz",
47+
"cypress": "https://cdn.cypress.io/beta/npm/12.0.0/linux-x64/release/12.0.0-79ea4537649ec49b72286fc6ba48089a0b9ff879/cypress.tgz",
4848
"kcd-scripts": "^11.2.0",
4949
"npm-run-all": "^4.1.5",
5050
"typescript": "^4.3.5"
5151
},
5252
"peerDependencies": {
53-
"cypress": "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
53+
"cypress": "^12.0.0"
5454
},
5555
"eslintConfig": {
5656
"extends": "./node_modules/kcd-scripts/eslint.js",

src/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ function createQuery(queryName, implementationName) {
4141
? 'child'
4242
: 'parent',
4343
message: inputArr,
44+
timeout: options.timeout,
4445
consoleProps: () => consoleProps,
4546
})
4647

types/index.d.ts

+16-16
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ declare global {
3030
* dom-testing-library helpers for Cypress
3131
*
3232
* `findBy*` APIs search for an element and throw an error if nothing found
33-
* `findAllBy*` APIs search for all elements and an error if nothing found
33+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
3434
*
3535
* @see https://github.com/testing-library/cypress-testing-library#usage
3636
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -44,7 +44,7 @@ declare global {
4444
* dom-testing-library helpers for Cypress
4545
*
4646
* `findBy*` APIs search for an element and throw an error if nothing found
47-
* `findAllBy*` APIs search for all elements and an error if nothing found
47+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
4848
*
4949
* @see https://github.com/testing-library/cypress-testing-library#usage
5050
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -58,7 +58,7 @@ declare global {
5858
* dom-testing-library helpers for Cypress
5959
*
6060
* `findBy*` APIs search for an element and throw an error if nothing found
61-
* `findAllBy*` APIs search for all elements and an error if nothing found
61+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
6262
*
6363
* @see https://github.com/testing-library/cypress-testing-library#usage
6464
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -72,7 +72,7 @@ declare global {
7272
* dom-testing-library helpers for Cypress
7373
*
7474
* `findBy*` APIs search for an element and throw an error if nothing found
75-
* `findAllBy*` APIs search for all elements and an error if nothing found
75+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
7676
*
7777
* @see https://github.com/testing-library/cypress-testing-library#usage
7878
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -86,7 +86,7 @@ declare global {
8686
* dom-testing-library helpers for Cypress
8787
*
8888
* `findBy*` APIs search for an element and throw an error if nothing found
89-
* `findAllBy*` APIs search for all elements and an error if nothing found
89+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
9090
*
9191
* @see https://github.com/testing-library/cypress-testing-library#usage
9292
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -100,7 +100,7 @@ declare global {
100100
* dom-testing-library helpers for Cypress
101101
*
102102
* `findBy*` APIs search for an element and throw an error if nothing found
103-
* `findAllBy*` APIs search for all elements and an error if nothing found
103+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
104104
*
105105
* @see https://github.com/testing-library/cypress-testing-library#usage
106106
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -114,7 +114,7 @@ declare global {
114114
* dom-testing-library helpers for Cypress
115115
*
116116
* `findBy*` APIs search for an element and throw an error if nothing found
117-
* `findAllBy*` APIs search for all elements and an error if nothing found
117+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
118118
*
119119
* @see https://github.com/testing-library/cypress-testing-library#usage
120120
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -125,7 +125,7 @@ declare global {
125125
* dom-testing-library helpers for Cypress
126126
*
127127
* `findBy*` APIs search for an element and throw an error if nothing found
128-
* `findAllBy*` APIs search for all elements and an error if nothing found
128+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
129129
*
130130
* @see https://github.com/testing-library/cypress-testing-library#usage
131131
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -136,7 +136,7 @@ declare global {
136136
* dom-testing-library helpers for Cypress
137137
*
138138
* `findBy*` APIs search for an element and throw an error if nothing found
139-
* `findAllBy*` APIs search for all elements and an error if nothing found
139+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
140140
*
141141
* @see https://github.com/testing-library/cypress-testing-library#usage
142142
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -147,7 +147,7 @@ declare global {
147147
* dom-testing-library helpers for Cypress
148148
*
149149
* `findBy*` APIs search for an element and throw an error if nothing found
150-
* `findAllBy*` APIs search for all elements and an error if nothing found
150+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
151151
*
152152
* @see https://github.com/testing-library/cypress-testing-library#usage
153153
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -158,7 +158,7 @@ declare global {
158158
* dom-testing-library helpers for Cypress
159159
*
160160
* `findBy*` APIs search for an element and throw an error if nothing found
161-
* `findAllBy*` APIs search for all elements and an error if nothing found
161+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
162162
*
163163
* @see https://github.com/testing-library/cypress-testing-library#usage
164164
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -169,7 +169,7 @@ declare global {
169169
* dom-testing-library helpers for Cypress
170170
*
171171
* `findBy*` APIs search for an element and throw an error if nothing found
172-
* `findAllBy*` APIs search for all elements and an error if nothing found
172+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
173173
*
174174
* @see https://github.com/testing-library/cypress-testing-library#usage
175175
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -180,7 +180,7 @@ declare global {
180180
* dom-testing-library helpers for Cypress
181181
*
182182
* `findBy*` APIs search for an element and throw an error if nothing found
183-
* `findAllBy*` APIs search for all elements and an error if nothing found
183+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
184184
*
185185
* @see https://github.com/testing-library/cypress-testing-library#usage
186186
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -194,7 +194,7 @@ declare global {
194194
* dom-testing-library helpers for Cypress
195195
*
196196
* `findBy*` APIs search for an element and throw an error if nothing found
197-
* `findAllBy*` APIs search for all elements and an error if nothing found
197+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
198198
*
199199
* @see https://github.com/testing-library/cypress-testing-library#usage
200200
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -208,7 +208,7 @@ declare global {
208208
* dom-testing-library helpers for Cypress
209209
*
210210
* `findBy*` APIs search for an element and throw an error if nothing found
211-
* `findAllBy*` APIs search for all elements and an error if nothing found
211+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
212212
*
213213
* @see https://github.com/testing-library/cypress-testing-library#usage
214214
* @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -219,7 +219,7 @@ declare global {
219219
* dom-testing-library helpers for Cypress
220220
*
221221
* `findBy*` APIs search for an element and throw an error if nothing found
222-
* `findAllBy*` APIs search for all elements and an error if nothing found
222+
* `findAllBy*` APIs search for all elements and throw an error if nothing found
223223
*
224224
* @see https://github.com/testing-library/cypress-testing-library#usage
225225
* @see https://github.com/testing-library/dom-testing-library#table-of-contents

0 commit comments

Comments
 (0)