From fdaa7e54a104e071924560040042bdb79f9ef283 Mon Sep 17 00:00:00 2001 From: Joseph Psychas <3214876+TheGallery@users.noreply.github.com> Date: Sat, 22 Aug 2020 23:40:54 +0100 Subject: [PATCH] feat(TS): move types from DefinitelyTyped (#148) Co-authored-by: Kent C. Dodds --- README.md | 29 +++--- package.json | 11 ++- types/add-commands.d.ts | 2 + types/index.d.ts | 202 ++++++++++++++++++++++++++++++++++++++++ types/test.ts | 25 +++++ types/tsconfig.json | 16 ++++ types/tslint.json | 9 ++ 7 files changed, 278 insertions(+), 16 deletions(-) create mode 100644 types/add-commands.d.ts create mode 100644 types/index.d.ts create mode 100644 types/test.ts create mode 100644 types/tsconfig.json create mode 100644 types/tslint.json diff --git a/README.md b/README.md index a982ac6..674ffde 100644 --- a/README.md +++ b/README.md @@ -58,10 +58,13 @@ This allows you to use all the useful + - [Installation](#installation) - [With TypeScript](#with-typescript) + - [Intellisense for JavaScript with VS Code](#intellisense-for-javascript-with-vs-code) - [Usage](#usage) - [Differences from DOM Testing Library](#differences-from-dom-testing-library) +- [Config testIdAttribute](#config-testidattribute) - [Other Solutions](#other-solutions) - [Contributors](#contributors) - [LICENSE](#license) @@ -79,21 +82,21 @@ npm install --save-dev @testing-library/cypress ### With TypeScript -Typings are defined in `@types/testing-library__cypress` at -[DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/testing-library__cypress), -and should be added as follows in `tsconfig.json`: +Typings should be added as follows in `tsconfig.json`: ```json { "compilerOptions": { - "types": ["cypress", "@types/testing-library__cypress"] + "types": ["cypress", "@testing-library/cypress"] } } ``` ### Intellisense for JavaScript with VS Code -If you're not using TypeScript, you use VS Code, and want to have code-completion with the methods from this library, simply add the following line to your project's root-level `jsconfig.json` file: +If you're not using TypeScript, you use VS Code, and want to have +code-completion with the methods from this library, simply add the following +line to your project's root-level `jsconfig.json` file: ```json { @@ -116,7 +119,7 @@ commands. [See the `DOM Testing Library` docs for reference](https://testing-library.com) You can find -[all Library definitions here](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/testing-library__cypress/index.d.ts). +[all Library definitions here](https://github.com/testing-library/cypress-testing-library/tree/master/types/index.d.ts). To configure DOM Testing Library, use the following custom command: @@ -134,9 +137,7 @@ cy.findAllByLabelText('Label text', {timeout: 7000}).should('exist') cy.findAllByText('Jackie Chan').click() // findAllByText _inside_ a form element -cy.get('form') - .findAllByText('Button Text') - .should('exist') +cy.get('form').findAllByText('Button Text').should('exist') ``` ### Differences from DOM Testing Library @@ -177,14 +178,16 @@ cy.findByText('Some Text').should('exist') ## Config testIdAttribute -If you would like to change the default testId from `data-testId` to `data-test-id`, add to your project's `cypress/support/index.js`: +If you would like to change the default testId from `data-testId` to +`data-test-id`, add to your project's `cypress/support/index.js`: ```javascript import {configure} from '@testing-library/cypress' configure({testIdAttribute: 'data-test-id'}) ``` -It accepts all configurations listed in [DOM testing library](https://testing-library.com/docs/dom-testing-library/api-configuration). +It accepts all configurations listed in +[DOM testing library](https://testing-library.com/docs/dom-testing-library/api-configuration). ## Other Solutions @@ -247,6 +250,7 @@ Thanks goes to these people ([emoji key][emojis]): + This project follows the [all-contributors][all-contributors] specification. @@ -297,5 +301,6 @@ MIT [all-contributors]: https://github.com/all-contributors/all-contributors [dom-testing-library]: https://github.com/testing-library/dom-testing-library [cypress]: https://www.cypress.io/ -[discord-badge]: https://img.shields.io/discord/723559267868737556.svg?color=7389D8&labelColor=6A7EC2&logo=discord&logoColor=ffffff&style=flat-square +[discord-badge]: + https://img.shields.io/discord/723559267868737556.svg?color=7389D8&labelColor=6A7EC2&logo=discord&logoColor=ffffff&style=flat-square [discord]: https://discord.gg/c6JN9fM diff --git a/package.json b/package.json index 0cb85b6..a8ebb52 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.0.0-semantically-released", "description": "Simple and complete custom Cypress commands and utilities that encourage good testing practices.", "main": "dist/index.js", + "types": "types/index.d.ts", "engines": { "node": ">=10", "npm": ">=6" @@ -18,11 +19,13 @@ "test:cypress:run": "cypress run", "test:unit": "kcd-scripts test --no-watch", "test:unit:watch": "kcd-scripts test", - "validate": "kcd-scripts validate build,lint,test" + "typecheck": "dtslint ./types/", + "validate": "kcd-scripts validate build,lint,test,typecheck" }, "files": [ "dist", - "add-commands.js" + "add-commands.js", + "types" ], "keywords": [ "testing", @@ -38,11 +41,11 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.11.2", - "@testing-library/dom": "^7.22.2", - "@types/testing-library__cypress": "^5.0.6" + "@testing-library/dom": "^7.22.2" }, "devDependencies": { "cypress": "^5.0.0", + "dtslint": "^3.6.14", "kcd-scripts": "^6.2.4", "npm-run-all": "^4.1.5" }, diff --git a/types/add-commands.d.ts b/types/add-commands.d.ts new file mode 100644 index 0000000..e6285e5 --- /dev/null +++ b/types/add-commands.d.ts @@ -0,0 +1,2 @@ +// Allow `import '@testing-library/cypress/add-commands'` from a `cypress/commands.ts` file +import './' diff --git a/types/index.d.ts b/types/index.d.ts new file mode 100644 index 0000000..77949bf --- /dev/null +++ b/types/index.d.ts @@ -0,0 +1,202 @@ +// TypeScript Version: 3.8 + +import { + configure, + Matcher, + MatcherOptions as DTLMatcherOptions, + ByRoleOptions as DTLByRoleOptions, + SelectorMatcherOptions as DTLSelectorMatcherOptions, +} from '@testing-library/dom' + +export interface CTLMatcherOptions { + timeout?: number + container?: HTMLElement | JQuery +} + +export type MatcherOptions = DTLMatcherOptions | CTLMatcherOptions +export type ByRoleOptions = DTLByRoleOptions | CTLMatcherOptions +export type SelectorMatcherOptions = DTLSelectorMatcherOptions | CTLMatcherOptions + +declare global { + namespace Cypress { + interface Chainable { + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findByPlaceholderText(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findAllByPlaceholderText(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findByText(id: Matcher, options?: SelectorMatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findAllByText(id: Matcher, options?: SelectorMatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findByLabelText(id: Matcher, options?: SelectorMatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findAllByLabelText(id: Matcher, options?: SelectorMatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findByAltText(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findAllByAltText(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findByTestId(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findAllByTestId(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findByTitle(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findAllByTitle(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findByDisplayValue(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findAllByDisplayValue(id: Matcher, options?: MatcherOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findByRole(id: Matcher, options?: ByRoleOptions): Chainable + + /** + * 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 + * + * @see https://github.com/testing-library/cypress-testing-library#usage + * @see https://github.com/testing-library/dom-testing-library#table-of-contents + */ + findAllByRole(id: Matcher, options?: ByRoleOptions): Chainable + } + } +} + +export { configure } diff --git a/types/test.ts b/types/test.ts new file mode 100644 index 0000000..bcf5e16 --- /dev/null +++ b/types/test.ts @@ -0,0 +1,25 @@ +/// +import { configure } from '@testing-library/cypress' +import '@testing-library/cypress/add-commands' + +configure({ testIdAttribute: 'data-myown-testid' }) + +// findBy* +cy.findByPlaceholderText('foo') // $ExpectType Chainable> +cy.findByText('foo') // $ExpectType Chainable> +cy.findByLabelText('foo') // $ExpectType Chainable> +cy.findByAltText('foo') // $ExpectType Chainable> +cy.findByTestId('foo') // $ExpectType Chainable> +cy.findByTitle('foo') // $ExpectType Chainable> +cy.findByDisplayValue('foo') // $ExpectType Chainable> +cy.findByRole('foo') // $ExpectType Chainable> + +// findAllBy* +cy.findAllByPlaceholderText('foo') // $ExpectType Chainable> +cy.findAllByText('foo') // $ExpectType Chainable> +cy.findAllByLabelText('foo') // $ExpectType Chainable> +cy.findAllByAltText('foo') // $ExpectType Chainable> +cy.findAllByTestId('foo') // $ExpectType Chainable> +cy.findAllByTitle('foo') // $ExpectType Chainable> +cy.findAllByDisplayValue('foo') // $ExpectType Chainable> +cy.findAllByRole('foo') // $ExpectType Chainable> diff --git a/types/tsconfig.json b/types/tsconfig.json new file mode 100644 index 0000000..22497e9 --- /dev/null +++ b/types/tsconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": ["es6", "dom"], + "noImplicitAny": true, + "noImplicitThis": true, + "strictFunctionTypes": true, + "strictNullChecks": true, + "baseUrl": ".", + "noEmit": true, + "types": [], + "paths": { + "@testing-library/cypress": ["."] + } + } +} diff --git a/types/tslint.json b/types/tslint.json new file mode 100644 index 0000000..cb0fce9 --- /dev/null +++ b/types/tslint.json @@ -0,0 +1,9 @@ +{ + "extends": ["dtslint/dtslint.json"], + "rules": { + "no-useless-files": false, + "no-relative-import-in-test": false, + "semicolon": false, + "whitespace": false + } +}