diff --git a/README.md b/README.md index 4f0ff8233..16c498ff0 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,7 @@ This library has a `peerDependencies` listing for `react-test-renderer`. Make su ### Additional Jest matchers -You can use the built-in Jest matchers by adding the following line to your `jest-setup.ts` file (configured using [`setupFilesAfterEnv`](https://jestjs.io/docs/configuration#setupfilesafterenv-array)): - -```ts -import '@testing-library/react-native/extend-expect'; -``` +You can use the built-in Jest matchers automatically by having any import from `@testing-library/react-native` in your test. ## Example diff --git a/extend-expect.d.ts b/extend-expect.d.ts deleted file mode 100644 index 14b2aff7c..000000000 --- a/extend-expect.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './build/matchers/extend-expect'; diff --git a/extend-expect.js b/extend-expect.js deleted file mode 100644 index 796915b5f..000000000 --- a/extend-expect.js +++ /dev/null @@ -1 +0,0 @@ -require('./build/matchers/extend-expect'); diff --git a/jest-setup.ts b/jest-setup.ts index a4d893a18..f120a77e7 100644 --- a/jest-setup.ts +++ b/jest-setup.ts @@ -1,5 +1,4 @@ import { resetToDefaults } from './src/pure'; -import './src/matchers/extend-expect'; beforeEach(() => { resetToDefaults(); diff --git a/matchers.d.ts b/matchers.d.ts new file mode 100644 index 000000000..6abd59c4e --- /dev/null +++ b/matchers.d.ts @@ -0,0 +1 @@ +export * from './build/matchers'; diff --git a/matchers.js b/matchers.js new file mode 100644 index 000000000..dafd7cfb2 --- /dev/null +++ b/matchers.js @@ -0,0 +1,2 @@ +// makes it so people can import from '@testing-library/react-native/pure' +module.exports = require('./build/matchers'); diff --git a/package.json b/package.json index a6feeb5ca..aa8c4b9bf 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "files": [ "build/", "jest-preset/", - "extend-expect.js", - "extend-expect.d.ts", + "matchers.js", + "matchers.d.ts", "pure.js", "pure.d.ts", "dont-cleanup-after-each.js", diff --git a/src/index.ts b/src/index.ts index b01198181..8b2ab83d4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,6 +1,7 @@ import { cleanup } from './pure'; import { flushMicroTasks } from './flush-micro-tasks'; import { getIsReactActEnvironment, setReactActEnvironment } from './act'; +import './matchers/extend-expect'; if (!process?.env?.RNTL_SKIP_AUTO_CLEANUP) { // If we're running in a test runner that supports afterEach diff --git a/src/matchers/__tests__/to-be-checked.test.tsx b/src/matchers/__tests__/to-be-checked.test.tsx index 6cf432b85..2b674c627 100644 --- a/src/matchers/__tests__/to-be-checked.test.tsx +++ b/src/matchers/__tests__/to-be-checked.test.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { type AccessibilityRole, Switch, View } from 'react-native'; -import render from '../../render'; -import { screen } from '../../screen'; +import { render, screen } from '../..'; function renderViewsWithRole(role: AccessibilityRole) { render( diff --git a/src/matchers/__tests__/to-be-partially-checked.test.tsx b/src/matchers/__tests__/to-be-partially-checked.test.tsx index 03ab58290..dd84e0cb7 100644 --- a/src/matchers/__tests__/to-be-partially-checked.test.tsx +++ b/src/matchers/__tests__/to-be-partially-checked.test.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { type AccessibilityRole, View } from 'react-native'; -import render from '../../render'; -import { screen } from '../../screen'; +import { render, screen } from '../..'; function renderViewsWithRole(role: AccessibilityRole) { return render(