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
5 changes: 5 additions & 0 deletions .changeset/short-teeth-stick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-component-mocker": patch
---

Omit children prop type from toHaveProps matcher
15 changes: 15 additions & 0 deletions examples/components/ComponentWithChildren.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type React from 'react';

export type ComponentWithChildrenProps = {
onClick: () => void;
children: React.ReactNode;
};

export const ComponentWithChildren: React.FC<ComponentWithChildrenProps> = ({
onClick,
children,
}) => (
<button type="button" onClick={onClick}>
{children}
</button>
);
23 changes: 21 additions & 2 deletions examples/jest.test.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import '@testing-library/jest-dom';
import { jest, describe, it } from '@jest/globals';
import { describe, it, jest } from '@jest/globals';
import { render, screen } from '@testing-library/react';
import { createMockComponent, getMockComponentProps } from '../src/index.js';
import { ContainerComponent } from './components/ContainerComponent.js';
import type { ComponentWithChildren } from './components/ComponentWithChildren.js';
import type { ComprehensiveComponent } from './components/ComprehensiveComponent.js';
import { ContainerComponent } from './components/ContainerComponent.js';

jest.mock('./components/ComprehensiveComponent.js', () => ({
ComprehensiveComponent: createMockComponent('comprehensive-component-mock'),
Expand Down Expand Up @@ -134,4 +135,22 @@ describe('ContainerComponent with Jest', () => {
componentProps.nestingProp.onNestingFn?.();
expect(onNestingFnMock).toHaveBeenCalled();
});

it('should work with components that have required children prop', () => {
const MockComponentWithChildren = createMockComponent<
typeof ComponentWithChildren
>('saved-signature-container');

render(
<MockComponentWithChildren onClick={jest.fn()}>
<div>Some content</div>
</MockComponentWithChildren>
);

const container = screen.getByTestId('saved-signature-container');

expect(container).toHaveProps<typeof ComponentWithChildren>({
onClick: expect.any(Function),
});
});
});
21 changes: 20 additions & 1 deletion examples/vitest.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { render, screen } from '@testing-library/react';
import { describe, expect, it, vi } from 'vitest';
import { createMockComponent, getMockComponentProps } from '../src/index.js';
import { ContainerComponent } from './components/ContainerComponent.js';
import type { ComponentWithChildren } from './components/ComponentWithChildren.js';
import type { ComprehensiveComponent } from './components/ComprehensiveComponent.js';
import { ContainerComponent } from './components/ContainerComponent.js';

vi.mock('./components/ComprehensiveComponent.js', () => ({
ComprehensiveComponent: createMockComponent('comprehensive-component-mock'),
Expand Down Expand Up @@ -133,4 +134,22 @@ describe('ContainerComponent', () => {
componentProps.nestingProp.onNestingFn?.();
expect(onNestingFnMock).toHaveBeenCalled();
});

it('should work with components that have required children prop', () => {
const MockComponentWithChildren = createMockComponent<
typeof ComponentWithChildren
>('saved-signature-container');

render(
<MockComponentWithChildren onClick={vi.fn()}>
<div>Some content</div>
</MockComponentWithChildren>
);

const container = screen.getByTestId('saved-signature-container');

expect(container).toHaveProps<typeof ComponentWithChildren>({
onClick: expect.any(Function),
});
});
});
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import './customMatchers/toHaveProp.js';
import type { ComponentProps, ComponentType } from 'react';

type ToHavePropsMatcherType<R> = <TComponent extends ComponentType<any>>(
expectedProps?: ComponentProps<TComponent>
expectedProps?: Omit<ComponentProps<TComponent>, 'children'>
) => R;

type ToHavePropMatcherType<R> = <TComponent extends ComponentType<any>>(
Expand Down