Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
test:
needs: [install-cache-deps]
runs-on: ubuntu-latest
name: Test (concurrent)
name: Test
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -67,16 +67,21 @@ jobs:
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

test-legacy:
test-react-18:
needs: [install-cache-deps]
runs-on: ubuntu-latest
name: Test (legacy)
name: Test React 18
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node.js and deps
uses: ./.github/actions/setup-deps

- name: Test in legacy mode
run: CONCURRENT_MODE=0 yarn test:ci
- name: Switch to React 18
run: |
yarn remove react react-test-renderer react-native @react-native/babel-preset
yarn add -D [email protected] [email protected] [email protected] @react-native/[email protected]

- name: Test
run: yarn test:ci
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
"@babel/preset-react": "^7.25.9",
"@babel/preset-typescript": "^7.26.0",
"@callstack/eslint-config": "^15.0.0",
"@react-native/babel-preset": "0.77.0",
"@react-native/babel-preset": "0.78.0-rc.3",
"@release-it/conventional-changelog": "^10.0.0",
"@relmify/jest-serializer-strip-ansi": "^1.0.2",
"@types/jest": "^29.5.14",
"@types/react": "^18.3.12",
"@types/react-test-renderer": "^18.3.0",
"@types/react": "^19.0.0",
"@types/react-test-renderer": "^19.0.0",
"babel-jest": "^29.7.0",
"babel-plugin-module-resolver": "^5.0.2",
"del-cli": "^6.0.0",
Expand All @@ -86,9 +86,9 @@
"flow-bin": "~0.170.0",
"jest": "^29.7.0",
"prettier": "^2.8.8",
"react": "18.3.1",
"react-native": "0.77.0",
"react-test-renderer": "18.3.1",
"react": "^19.0.0",
"react-native": "0.78.0-rc.3",
"react-test-renderer": "^19.0.0",
"release-it": "^18.0.0",
"typescript": "^5.6.3",
"typescript-eslint": "^8.19.1"
Expand Down
3 changes: 0 additions & 3 deletions src/matchers/__tests__/to-be-disabled.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ test.each([
['TouchableNativeFeedback', TouchableNativeFeedback],
] as const)('toBeDisabled()/toBeEnabled() supports %s with "disabled" prop', (_, Component) => {
render(
// @ts-expect-error disabled prop is not available on all Touchables
<Component disabled testID="subject">
<Text>Button</Text>
</Component>,
Expand Down Expand Up @@ -191,7 +190,6 @@ test.each([
'toBeDisabled()/toBeEnabled() supports %s with "aria-disabled" prop',
(_, Component) => {
render(
// @ts-expect-error too generic for typescript
<Component testID="subject" aria-disabled>
<Text>Hello</Text>
</Component>,
Expand All @@ -218,7 +216,6 @@ test.each([
'toBeDisabled()/toBeEnabled() supports %s with "accessibilityState.disabled" prop',
(_, Component) => {
render(
// @ts-expect-error disabled prop is not available on all Touchables
<Component testID="subject" accessibilityState={{ disabled: true }}>
<Text>Hello</Text>
</Component>,
Expand Down
2 changes: 1 addition & 1 deletion src/render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function renderWithStringValidation<T>(

function buildRenderResult(
renderer: ReactTestRenderer,
wrap: (element: React.ReactElement) => JSX.Element,
wrap: (element: React.ReactElement) => React.JSX.Element,
) {
const update = updateWithAct(renderer, wrap);
const instance = renderer.root;
Expand Down
Loading