Skip to content

Commit ab35c27

Browse files
snowystingersnowystinger
committed
chore: fix rest of tests from provider requirement
1 parent 71f0ef2 commit ab35c27

File tree

77 files changed

+172
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+172
-230
lines changed

‎packages/@react-aria/dnd/test/useDroppableCollection.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, fireEvent, pointerMap, render, waitFor, within} from '@react-spectrum/test-utils-internal';
13+
import {act, fireEvent, pointerMap, renderv3 as render, waitFor, within} from '@react-spectrum/test-utils-internal';
1414
import {DataTransfer, DragEvent} from './mocks';
1515
import {Draggable} from './examples';
1616
import {DroppableGridExample} from '../stories/DroppableGrid';

‎packages/@react-aria/landmark/test/useLandmark.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
13+
import {act, fireEvent, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1414
import {ActionGroup, Item} from '@react-spectrum/actiongroup';
1515
import {Button} from '@react-spectrum/button';
1616
import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';

‎packages/@react-spectrum/accordion/test/Accordion.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import {Accordion, Disclosure, DisclosurePanel, DisclosureTitle} from '../src';
14-
import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
14+
import {act, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1515
import {Provider} from '@react-spectrum/provider';
1616
import React from 'react';
1717
import {theme} from '@react-spectrum/theme-default';

‎packages/@react-spectrum/actionbar/test/ActionBar.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
jest.mock('@react-aria/live-announcer');
15-
import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
15+
import {act, fireEvent, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1616
import {announce} from '@react-aria/live-announcer';
1717
import {Example} from '../stories/Example';
1818
import {getFocusableTreeWalker} from '@react-aria/focus';

‎packages/@react-spectrum/avatar/test/Avatar.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Avatar} from '../';
22
import React from 'react';
3-
import {render, screen} from '@react-spectrum/test-utils-internal';
3+
import {renderv3 as render, screen} from '@react-spectrum/test-utils-internal';
44

55
let isOldReact = parseInt(React.version, 10) < 18;
66

‎packages/@react-spectrum/badge/test/Badge.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import {Badge} from '../';
1414
import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
1515
import React from 'react';
16-
import {render} from '@react-spectrum/test-utils-internal';
16+
import {renderv3 as render} from '@react-spectrum/test-utils-internal';
1717
import {Text} from '@react-spectrum/text';
1818
import {within} from '@testing-library/dom';
1919

‎packages/@react-spectrum/breadcrumbs/test/BreadcrumbItem.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import {BreadcrumbItem} from '../src/BreadcrumbItem';
14-
import {pointerMap, render} from '@react-spectrum/test-utils-internal';
14+
import {pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1515
import React from 'react';
1616
import userEvent from '@testing-library/user-event';
1717

‎packages/@react-spectrum/breadcrumbs/test/Breadcrumbs.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
13+
import {act, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1414
import {Breadcrumbs} from '../';
1515
import {Item} from '@react-stately/collections';
1616
import {Provider} from '@react-spectrum/provider';

‎packages/@react-spectrum/button/test/ActionButton.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import {ActionButton} from '../';
14-
import {pointerMap, render} from '@react-spectrum/test-utils-internal';
14+
import {pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1515
import React from 'react';
1616
import userEvent from '@testing-library/user-event';
1717

‎packages/@react-spectrum/button/test/Button.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
13+
import {act, pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1414
import {ActionButton, Button, ClearButton, LogicButton} from '../';
1515
import {Checkbox, defaultTheme} from '@adobe/react-spectrum';
1616
import {Form} from '@react-spectrum/form';

‎packages/@react-spectrum/button/test/ClearButton.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
13+
import {act, pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1414
import {ClearButton} from '../';
1515
import React from 'react';
1616
import userEvent from '@testing-library/user-event';

‎packages/@react-spectrum/button/test/ToggleButton.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {pointerMap, render} from '@react-spectrum/test-utils-internal';
13+
import {pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1414
import React from 'react';
1515
import {ToggleButton} from '../';
1616
import userEvent from '@testing-library/user-event';

‎packages/@react-spectrum/buttongroup/test/ButtonGroup.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
13+
import {act, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1414
import {Button} from '@react-spectrum/button';
1515
import {ButtonGroup} from '../';
1616
import {Provider} from '@react-spectrum/provider';

‎packages/@react-spectrum/calendar/test/Calendar.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jest.mock('@react-aria/live-announcer');
1616
import {announce} from '@react-aria/live-announcer';
1717
import {Calendar} from '../';
1818
import {CalendarDate, isWeekend} from '@internationalized/date';
19-
import {pointerMap, render} from '@react-spectrum/test-utils-internal';
19+
import {pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
2020
import React from 'react';
2121
import {useLocale} from '@react-aria/i18n';
2222
import userEvent from '@testing-library/user-event';

‎packages/@react-spectrum/calendar/test/CalendarBase.test.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
13+
import {act, fireEvent, render as noProviderRender, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1414
import {Calendar, RangeCalendar} from '../';
1515
import {CalendarDate, GregorianCalendar, today} from '@internationalized/date';
1616
import {Provider} from '@react-spectrum/provider';
@@ -268,10 +268,8 @@ describe('CalendarBase', () => {
268268
${'v3 RangeCalendar'} | ${RangeCalendar}
269269
`('$Name should handle minimum dates in a calendar system', ({Calendar}) => {
270270
let {getByRole, getAllByRole} = render(
271-
<Provider theme={theme} locale="en-US-u-ca-japanese">
272-
<Calendar defaultFocusedValue={new CalendarDate(1868, 9, 12)} />
273-
</Provider>
274-
);
271+
<Calendar defaultFocusedValue={new CalendarDate(1868, 9, 12)} />
272+
, undefined, {locale: 'en-US-u-ca-japanese'});
275273

276274
let grid = getByRole('grid');
277275
let headers = within(grid).getAllByRole('columnheader', {hidden: true});
@@ -752,7 +750,7 @@ describe('CalendarBase', () => {
752750
${'v3 RangeCalendar'} | ${RangeCalendar} | ${{defaultValue: {start: new CalendarDate(2019, 6, 5), end: new CalendarDate(2019, 6, 10)}}}
753751
`('$Name should mirror arrow key movement in an RTL locale', async ({Calendar, props}) => {
754752
// LTR
755-
let {getByRole, getAllByRole, rerender} = render(
753+
let {getByRole, getAllByRole, rerender} = noProviderRender(
756754
<Provider theme={theme} locale="en-US">
757755
<Calendar {...props} autoFocus />
758756
</Provider>

‎packages/@react-spectrum/calendar/test/RangeCalendar.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
jest.mock('@react-aria/live-announcer');
14-
import {act, fireEvent, installPointerEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
14+
import {act, fireEvent, installPointerEvent, pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1515
import {announce} from '@react-aria/live-announcer';
1616
import {CalendarDate, isWeekend} from '@internationalized/date';
1717
import {RangeCalendar} from '../';

‎packages/@react-spectrum/card/test/Card.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import {Card} from '../src';
1414
import {composeStories} from '@storybook/react';
1515
import * as defaultStories from '../chromatic/Card.stories';
16-
import {pointerMap, render} from '@react-spectrum/test-utils-internal';
16+
import {pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1717
import * as quietStories from '../chromatic/QuietCard.stories';
1818
import React from 'react';
1919
import userEvent from '@testing-library/user-event';

‎packages/@react-spectrum/card/test/CardView.test.js

+35-51
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,15 @@
1111
*/
1212

1313
jest.mock('@react-aria/utils/src/scrollIntoView');
14-
import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
14+
import {act, fireEvent, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1515
import {Card, CardView, GalleryLayout, GridLayout, WaterfallLayout} from '../';
1616
import {composeStories} from '@storybook/react';
1717
import {Content} from '@react-spectrum/view';
1818
import {Heading, Text} from '@react-spectrum/text';
1919
import {Image} from '@react-spectrum/image';
20-
import {Provider} from '@react-spectrum/provider';
2120
import React, {useMemo} from 'react';
22-
import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium-unique.css';
2321
import {scrollIntoView} from '@react-aria/utils';
2422
import * as stories from '../stories/GridCardView.stories';
25-
import themeLight from '@adobe/spectrum-css-temp/vars/spectrum-light-unique.css';
2623
import {useCollator} from '@react-aria/i18n';
2724
import userEvent from '@testing-library/user-event';
2825

@@ -31,11 +28,6 @@ let isOldReact = parseInt(React.version, 10) < 18;
3128
let {falsyItems} = stories;
3229
let {FalsyIds} = composeStories(stories);
3330

34-
let theme = {
35-
light: themeLight,
36-
medium: scaleMedium
37-
};
38-
3931
let defaultItems = [
4032
{width: 1001, height: 381, src: 'https://i.imgur.com/Z7AzH2c.jpg', title: 'Title 1'},
4133
{width: 640, height: 640, src: 'https://i.imgur.com/DhygPot.jpg', title: 'Title 2'},
@@ -77,33 +69,30 @@ function StaticCardView(props) {
7769
let {
7870
layout = gridLayout,
7971
selectionMode = 'multiple',
80-
locale = 'en-US',
8172
...otherProps
8273
} = props;
8374

8475
return (
85-
<Provider theme={theme} locale={locale}>
86-
<CardView onSelectionChange={onSelectionChange} {...otherProps} selectionMode={selectionMode} layout={layout} width="100%" height="100%" aria-label="Test CardView">
87-
<Card width={1001} height={381} textValue="Title 1">
88-
<Image src="https://i.imgur.com/Z7AzH2c.jpg" />
89-
<Heading>Title 1</Heading>
90-
<Text slot="detail">PNG</Text>
91-
<Content>Description</Content>
92-
</Card>
93-
<Card width={640} height={640} textValue="Title 1">
94-
<Image src="https://i.imgur.com/DhygPot.jpg" />
95-
<Heading>Title 1</Heading>
96-
<Text slot="detail">PNG</Text>
97-
<Content>Description</Content>
98-
</Card>
99-
<Card width={182} height={1009} textValue="Title 1">
100-
<Image src="https://i.imgur.com/L7RTlvI.png" />
101-
<Heading>Title 1</Heading>
102-
<Text slot="detail">PNG</Text>
103-
<Content>Description</Content>
104-
</Card>
105-
</CardView>
106-
</Provider>
76+
<CardView onSelectionChange={onSelectionChange} {...otherProps} selectionMode={selectionMode} layout={layout} width="100%" height="100%" aria-label="Test CardView">
77+
<Card width={1001} height={381} textValue="Title 1">
78+
<Image src="https://i.imgur.com/Z7AzH2c.jpg" />
79+
<Heading>Title 1</Heading>
80+
<Text slot="detail">PNG</Text>
81+
<Content>Description</Content>
82+
</Card>
83+
<Card width={640} height={640} textValue="Title 1">
84+
<Image src="https://i.imgur.com/DhygPot.jpg" />
85+
<Heading>Title 1</Heading>
86+
<Text slot="detail">PNG</Text>
87+
<Content>Description</Content>
88+
</Card>
89+
<Card width={182} height={1009} textValue="Title 1">
90+
<Image src="https://i.imgur.com/L7RTlvI.png" />
91+
<Heading>Title 1</Heading>
92+
<Text slot="detail">PNG</Text>
93+
<Content>Description</Content>
94+
</Card>
95+
</CardView>
10796
);
10897
}
10998

@@ -115,23 +104,20 @@ function DynamicCardView(props) {
115104
layout = gridLayout,
116105
selectionMode = 'multiple',
117106
items = defaultItems,
118-
locale = 'en-US',
119107
...otherProps
120108
} = props;
121109

122110
return (
123-
<Provider theme={theme} locale={locale}>
124-
<CardView onSelectionChange={onSelectionChange} {...otherProps} selectionMode={selectionMode} items={items} layout={layout} width="100%" height="100%" aria-label="Test CardView">
125-
{(item) => (
126-
<Card key={item.title} textValue={item.title} width={item.width} height={item.height}>
127-
<Image src={item.src} />
128-
<Heading>{item.title}</Heading>
129-
<Text slot="detail">PNG</Text>
130-
<Content>Description</Content>
131-
</Card>
111+
<CardView onSelectionChange={onSelectionChange} {...otherProps} selectionMode={selectionMode} items={items} layout={layout} width="100%" height="100%" aria-label="Test CardView">
112+
{(item) => (
113+
<Card key={item.title} textValue={item.title} width={item.width} height={item.height}>
114+
<Image src={item.src} />
115+
<Heading>{item.title}</Heading>
116+
<Text slot="detail">PNG</Text>
117+
<Content>Description</Content>
118+
</Card>
132119
)}
133-
</CardView>
134-
</Provider>
120+
</CardView>
135121
);
136122
}
137123

@@ -225,9 +211,7 @@ describe('CardView', function () {
225211
${'Waterfall layout'} | ${WaterfallLayout}
226212
`('$Name CardView supports falsy ids', function ({layout}) {
227213
let tree = render(
228-
<Provider theme={theme} locale="en-US">
229-
<FalsyIds items={falsyItems} aria-label="test falsy" layout={layout} />
230-
</Provider>
214+
<FalsyIds items={falsyItems} aria-label="test falsy" layout={layout} />
231215
);
232216
act(() => {
233217
jest.runAllTimers();
@@ -394,7 +378,7 @@ describe('CardView', function () {
394378
${'Grid layout'} | ${GridLayout}
395379
${'Gallery layout'} | ${GalleryLayout}
396380
`('$Name CardView should move focus via Arrow Left (RTL)', async function ({Name, layout}) {
397-
let tree = render(<DynamicCardView locale="ar-AE" layout={layout} />);
381+
let tree = render(<DynamicCardView layout={layout} />, undefined, {locale: 'ar-AE'});
398382
act(() => {
399383
jest.runAllTimers();
400384
});
@@ -460,7 +444,7 @@ describe('CardView', function () {
460444
${'Grid layout'} | ${GridLayout}
461445
${'Gallery layout'} | ${GalleryLayout}
462446
`('$Name CardView should move focus via Arrow Right (RTL)', async function ({Name, layout}) {
463-
let tree = render(<DynamicCardView locale="ar-AE" layout={layout} />);
447+
let tree = render(<DynamicCardView layout={layout} />, undefined, {locale: 'ar-AE'});
464448
act(() => {
465449
jest.runAllTimers();
466450
});
@@ -842,7 +826,7 @@ describe('CardView', function () {
842826
});
843827

844828
it('should move focus via Arrow Left (RTL)', async function () {
845-
let tree = render(<DynamicCardView locale="ar-AE" layout={WaterfallLayout} />);
829+
let tree = render(<DynamicCardView layout={WaterfallLayout} />, undefined, {locale: 'ar-AE'});
846830
act(() => {
847831
jest.runAllTimers();
848832
});
@@ -899,7 +883,7 @@ describe('CardView', function () {
899883
});
900884

901885
it('should move focus via Arrow Right (RTL)', async function () {
902-
let tree = render(<DynamicCardView locale="ar-AE" layout={WaterfallLayout} />);
886+
let tree = render(<DynamicCardView layout={WaterfallLayout} />, undefined, {locale: 'ar-AE'});
903887
act(() => {
904888
jest.runAllTimers();
905889
});

‎packages/@react-spectrum/checkbox/test/Checkbox.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {act} from 'react-dom/test-utils';
1414
import {Button} from '@react-spectrum/button';
1515
import {Checkbox} from '../';
1616
import {Form} from '@react-spectrum/form';
17-
import {pointerMap, render} from '@react-spectrum/test-utils-internal';
17+
import {pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1818
import {Provider} from '@react-spectrum/provider';
1919
import React from 'react';
2020
import {theme} from '@react-spectrum/theme-default';

‎packages/@react-spectrum/checkbox/test/CheckboxGroup.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
13+
import {act, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1414
import {Button} from '@react-spectrum/button';
1515
import {Checkbox, CheckboxGroup} from '../';
1616
import {Form} from '@react-spectrum/form';

‎packages/@react-spectrum/color/test/ColorField.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
13+
import {act, fireEvent, pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
1414
import {Button} from '@react-spectrum/button';
1515
import {chain} from '@react-aria/utils';
1616
import {ColorField} from '../';

‎packages/@react-spectrum/color/test/ColorSwatchPicker.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import {ColorSwatch, ColorSwatchPicker, parseColor} from '../src';
14-
import {pointerMap, render, within} from '@react-spectrum/test-utils-internal';
14+
import {pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
1515
import React from 'react';
1616
import userEvent from '@testing-library/user-event';
1717

‎packages/@react-spectrum/contextualhelp/test/ContextualHelp.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, pointerMap, render, simulateDesktop} from '@react-spectrum/test-utils-internal';
13+
import {act, pointerMap, renderv3 as render, simulateDesktop} from '@react-spectrum/test-utils-internal';
1414
import {Content, Footer, Header} from '@react-spectrum/view';
1515
import {ContextualHelp} from '../';
1616
import {Link} from '@react-spectrum/link';

‎packages/@react-spectrum/datepicker/test/DateField.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {act, pointerMap, render as render_, within} from '@react-spectrum/test-utils-internal';
13+
import {act, pointerMap, renderv3 as render_, within} from '@react-spectrum/test-utils-internal';
1414
import {Button} from '@react-spectrum/button';
1515
import {CalendarDate, CalendarDateTime, ZonedDateTime} from '@internationalized/date';
1616
import {DateField} from '../';

0 commit comments

Comments
 (0)