Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Composite: always await initial render setup in unit tests #65823

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Composite: always await initial render setup in unit tests #65823

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 22 additions & 21 deletions packages/components/src/composite/legacy/test/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ describe.each( [
<button>After</button>
</>
);
renderAndValidate( <Test /> );
await renderAndValidate( <Test /> );

await press.Tab();
expect( screen.getByText( 'Before' ) ).toHaveFocus();
Expand Down Expand Up @@ -260,7 +260,7 @@ describe.each( [
</Composite>
);
};
renderAndValidate( <Test /> );
await renderAndValidate( <Test /> );

const { item1, item2, item3 } = getOneDimensionalItems();

Expand Down Expand Up @@ -289,7 +289,7 @@ describe.each( [
</Composite>
);
};
renderAndValidate( <Test /> );
await renderAndValidate( <Test /> );
const { item1, item2, item3 } = getOneDimensionalItems();

expect( item2 ).toBeEnabled();
Expand All @@ -310,7 +310,7 @@ describe.each( [
} ) }
/>
);
renderAndValidate( <Test /> );
await renderAndValidate( <Test /> );
const { item1, item2, item3 } = getOneDimensionalItems();

expect( item1.id ).toMatch( 'test-id-1' );
Expand All @@ -327,7 +327,7 @@ describe.each( [
} ) }
/>
);
renderAndValidate( <Test /> );
await renderAndValidate( <Test /> );
const { item2 } = getOneDimensionalItems();

await press.Tab();
Expand All @@ -341,37 +341,37 @@ describe.each( [
] )( '%s', ( _when, rtl ) => {
const { previous, next, first, last } = getKeys( rtl );

function useOneDimensionalTest( initialState?: InitialState ) {
async function useOneDimensionalTest( initialState?: InitialState ) {
const Test = () => (
<OneDimensionalTest
state={ useCompositeState( { rtl, ...initialState } ) }
/>
);
renderAndValidate( <Test /> );
await renderAndValidate( <Test /> );
return getOneDimensionalItems();
}

function useTwoDimensionalTest( initialState?: InitialState ) {
async function useTwoDimensionalTest( initialState?: InitialState ) {
const Test = () => (
<TwoDimensionalTest
state={ useCompositeState( { rtl, ...initialState } ) }
/>
);
renderAndValidate( <Test /> );
await renderAndValidate( <Test /> );
return getTwoDimensionalItems();
}

function useShiftTest( shift: boolean ) {
async function useShiftTest( shift: boolean ) {
const Test = () => (
<ShiftTest state={ useCompositeState( { rtl, shift } ) } />
);
renderAndValidate( <Test /> );
await renderAndValidate( <Test /> );
return getShiftTestItems();
}

describe( 'In one dimension', () => {
test( 'All directions work with no orientation', async () => {
const { item1, item2, item3 } = useOneDimensionalTest();
const { item1, item2, item3 } = await useOneDimensionalTest();

await press.Tab();
expect( item1 ).toHaveFocus();
Expand Down Expand Up @@ -406,7 +406,7 @@ describe.each( [
} );

test( 'Only left/right work with horizontal orientation', async () => {
const { item1, item2, item3 } = useOneDimensionalTest( {
const { item1, item2, item3 } = await useOneDimensionalTest( {
orientation: 'horizontal',
} );

Expand Down Expand Up @@ -435,7 +435,7 @@ describe.each( [
} );

test( 'Only up/down work with vertical orientation', async () => {
const { item1, item2, item3 } = useOneDimensionalTest( {
const { item1, item2, item3 } = await useOneDimensionalTest( {
orientation: 'vertical',
} );

Expand Down Expand Up @@ -464,7 +464,7 @@ describe.each( [
} );

test( 'Focus wraps with loop enabled', async () => {
const { item1, item2, item3 } = useOneDimensionalTest( {
const { item1, item2, item3 } = await useOneDimensionalTest( {
loop: true,
} );

Expand All @@ -488,7 +488,7 @@ describe.each( [
describe( 'In two dimensions', () => {
test( 'All directions work as standard', async () => {
const { itemA1, itemA2, itemA3, itemB1, itemB2, itemC1, itemC3 } =
useTwoDimensionalTest();
await useTwoDimensionalTest();

await press.Tab();
expect( itemA1 ).toHaveFocus();
Expand Down Expand Up @@ -524,7 +524,7 @@ describe.each( [

test( 'Focus wraps around rows/columns with loop enabled', async () => {
const { itemA1, itemA2, itemA3, itemB1, itemC1, itemC3 } =
useTwoDimensionalTest( { loop: true } );
await useTwoDimensionalTest( { loop: true } );

await press.Tab();
expect( itemA1 ).toHaveFocus();
Expand All @@ -548,7 +548,7 @@ describe.each( [

test( 'Focus moves between rows/columns with wrap enabled', async () => {
const { itemA1, itemA2, itemA3, itemB1, itemC1, itemC3 } =
useTwoDimensionalTest( { wrap: true } );
await useTwoDimensionalTest( { wrap: true } );

await press.Tab();
expect( itemA1 ).toHaveFocus();
Expand Down Expand Up @@ -577,7 +577,7 @@ describe.each( [
} );

test( 'Focus wraps around start/end with loop and wrap enabled', async () => {
const { itemA1, itemC3 } = useTwoDimensionalTest( {
const { itemA1, itemC3 } = await useTwoDimensionalTest( {
loop: true,
wrap: true,
} );
Expand All @@ -595,7 +595,8 @@ describe.each( [
} );

test( 'Focus shifts if vertical neighbour unavailable when shift enabled', async () => {
const { itemA1, itemB1, itemB2, itemC1 } = useShiftTest( true );
const { itemA1, itemB1, itemB2, itemC1 } =
await useShiftTest( true );

await press.Tab();
expect( itemA1 ).toHaveFocus();
Expand All @@ -616,7 +617,7 @@ describe.each( [
} );

test( 'Focus does not shift if vertical neighbour unavailable when shift not enabled', async () => {
const { itemA1, itemB1, itemB2 } = useShiftTest( false );
const { itemA1, itemB1, itemB2 } = await useShiftTest( false );

await press.Tab();
expect( itemA1 ).toHaveFocus();
Expand Down
Loading