Merge remote-tracking branch 'main/main'

testing-library · Nov 21, 2022 · 9a49d22 · 9a49d22
2 parents 3be2a9c + 8d66009
commit 9a49d22
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -16,7 +16,7 @@ jobs:
     if: ${{ !contains(github.head_ref, 'all-contributors') }}
     strategy:
       matrix:
-        node: [12, 14, 16]
+        node: [12, 14, 16, 18]
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs

diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ cy.configureCypressTestingLibrary(config)
 ```
 
 To show some simple examples (from
-[cypress/integration/find.spec.js](cypress/integration/find.spec.js)):
+[cypress/e2e/find.cy.js](cypress/e2e/find.cy.js)):
 
 ```javascript
 cy.findAllByText('Button Text').should('exist')

diff --git a/package.json b/package.json
@@ -44,13 +44,13 @@
     "@testing-library/dom": "^8.1.0"
   },
   "devDependencies": {
-    "cypress": "https://cdn.cypress.io/beta/npm/12.0.0/linux-x64/release/12.0.0-4db85d690e8439ef4d2397238ab069d557b2e818/cypress.tgz",
+    "cypress": "https://cdn.cypress.io/beta/npm/12.0.0/linux-x64/release/12.0.0-79ea4537649ec49b72286fc6ba48089a0b9ff879/cypress.tgz",
     "kcd-scripts": "^11.2.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.3.5"
   },
   "peerDependencies": {
-    "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"
+    "cypress": "^12.0.0"
   },
   "eslintConfig": {
     "extends": "./node_modules/kcd-scripts/eslint.js",

diff --git a/src/index.js b/src/index.js
@@ -41,6 +41,7 @@ function createQuery(queryName, implementationName) {
               ? 'child'
               : 'parent',
           message: inputArr,
+          timeout: options.timeout,
           consoleProps: () => consoleProps,
         })
 

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -30,7 +30,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -44,7 +44,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -58,7 +58,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -72,7 +72,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -86,7 +86,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -100,7 +100,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -114,7 +114,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -125,7 +125,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -136,7 +136,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -147,7 +147,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -158,7 +158,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -169,7 +169,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -180,7 +180,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -194,7 +194,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -208,7 +208,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents
@@ -219,7 +219,7 @@ declare global {
        * dom-testing-library helpers for Cypress
        *
        * `findBy*` APIs search for an element and throw an error if nothing found
-       * `findAllBy*` APIs search for all elements and an error if nothing found
+       * `findAllBy*` APIs search for all elements and throw an error if nothing found
        *
        * @see https://github.com/testing-library/cypress-testing-library#usage
        * @see https://github.com/testing-library/dom-testing-library#table-of-contents