Skip to content

Commit e539ae0

Browse files
authored
chore: Removes deprecated stsn test helper (#162)
1 parent 15f08d8 commit e539ae0

File tree

3 files changed

+18
-38
lines changed

3 files changed

+18
-38
lines changed

src/internal/single-tab-stop/__tests__/context.test.tsx

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ import {
1111
SingleTabStopNavigationReset,
1212
useSingleTabStopNavigation,
1313
} from '../';
14-
import {
15-
setTestSingleTabStopNavigationTarget,
16-
renderWithSingleTabStopNavigation,
17-
TestSingleTabStopNavigationProvider,
18-
} from '../test-helpers';
14+
import { setTestSingleTabStopNavigationTarget, TestSingleTabStopNavigationProvider } from '../test-helpers';
1915

2016
// Simple STSN subscriber component
2117
function Button(props: React.HTMLAttributes<HTMLButtonElement>) {
@@ -69,22 +65,25 @@ test('does not override tab index when keyboard navigation is not active', () =>
6965
});
7066

7167
test('(legacy coverage) does not override tab index when keyboard navigation is not active', () => {
72-
renderWithSingleTabStopNavigation(<Button id="button" />, { navigationActive: false });
68+
render(
69+
<TestSingleTabStopNavigationProvider navigationActive={false}>
70+
<Button id="button" />
71+
</TestSingleTabStopNavigationProvider>
72+
);
7373
expect(document.querySelector('#button')).not.toHaveAttribute('tabIndex');
7474
});
7575

7676
test('does not override tab index for suppressed elements', () => {
77-
const { setCurrentTarget } = renderWithSingleTabStopNavigation(
78-
<div>
77+
render(
78+
<TestSingleTabStopNavigationProvider navigationActive={true}>
7979
<Button id="button1" />
8080
<Button id="button2" />
8181
<Button id="button3" tabIndex={-1} />
8282
<Button id="button4" />
8383
<Button id="button5" tabIndex={-1} />
84-
</div>,
85-
{ navigationActive: true }
84+
</TestSingleTabStopNavigationProvider>
8685
);
87-
setCurrentTarget(document.querySelector('#button1'), [
86+
setTestSingleTabStopNavigationTarget(document.querySelector('#button1'), [
8887
document.querySelector('#button1'),
8988
document.querySelector('#button2'),
9089
document.querySelector('#button3'),
@@ -109,25 +108,25 @@ test('overrides tab index when keyboard navigation is active', () => {
109108
});
110109

111110
test('(legacy coverage) overrides tab index when keyboard navigation is active', () => {
112-
const { setCurrentTarget } = renderWithSingleTabStopNavigation(
113-
<div>
111+
render(
112+
<TestSingleTabStopNavigationProvider navigationActive={true}>
114113
<Button id="button1" />
115114
<Button id="button2" />
116-
</div>
115+
</TestSingleTabStopNavigationProvider>
117116
);
118-
setCurrentTarget(document.querySelector('#button1'));
117+
setTestSingleTabStopNavigationTarget(document.querySelector('#button1'));
119118
expect(document.querySelector('#button1')).toHaveAttribute('tabIndex', '0');
120119
expect(document.querySelector('#button2')).toHaveAttribute('tabIndex', '-1');
121120
});
122121

123122
test('does not override explicit tab index with 0', () => {
124-
const { setCurrentTarget } = renderWithSingleTabStopNavigation(
125-
<div>
123+
render(
124+
<TestSingleTabStopNavigationProvider navigationActive={true}>
126125
<Button id="button1" tabIndex={-2} />
127126
<Button id="button2" tabIndex={-2} />
128-
</div>
127+
</TestSingleTabStopNavigationProvider>
129128
);
130-
setCurrentTarget(document.querySelector('#button1'));
129+
setTestSingleTabStopNavigationTarget(document.querySelector('#button1'));
131130
expect(document.querySelector('#button1')).toHaveAttribute('tabIndex', '-2');
132131
expect(document.querySelector('#button2')).toHaveAttribute('tabIndex', '-2');
133132
});

src/internal/single-tab-stop/test-helpers/index.tsx

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
import React, { forwardRef, useCallback, useEffect, useRef } from 'react';
5-
import { render } from '@testing-library/react';
65

76
import { FocusableChangeHandler, SingleTabStopNavigationContext } from '../';
87
import { useUniqueId } from '../../use-unique-id';
@@ -57,20 +56,3 @@ export const TestSingleTabStopNavigationProvider = forwardRef(
5756
export const setTestSingleTabStopNavigationTarget: SetTarget = (focusTarget, suppressed) => {
5857
Array.from(providerRegistry).forEach(([, provider]) => provider.setCurrentTarget(focusTarget, suppressed));
5958
};
60-
61-
/**
62-
* @deprecated - Use TestSingleTabStopNavigationProvider instead
63-
*/
64-
export function renderWithSingleTabStopNavigation(
65-
ui: React.ReactNode,
66-
{ navigationActive = true }: { navigationActive?: boolean } = {}
67-
) {
68-
const { container, rerender } = render(
69-
<TestSingleTabStopNavigationProvider navigationActive={navigationActive}>{ui}</TestSingleTabStopNavigationProvider>
70-
);
71-
return {
72-
container,
73-
rerender,
74-
setCurrentTarget: setTestSingleTabStopNavigationTarget,
75-
};
76-
}

src/internal/testing.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ export { clearMessageCache } from './logging';
66
export { setGlobalFlag } from './global-flags';
77
export { clearVisualRefreshState } from './visual-mode';
88
export {
9-
renderWithSingleTabStopNavigation,
109
TestSingleTabStopNavigationProvider,
1110
setTestSingleTabStopNavigationTarget,
1211
} from './single-tab-stop/test-helpers';

0 commit comments

Comments
 (0)