From afc2bdcdb841a00bb426dfbe364c88c8f8b4ee58 Mon Sep 17 00:00:00 2001
From: asvarcas <asvarcas@etriek.com.uy>
Date: Sun, 23 May 2021 10:39:06 -0300
Subject: [PATCH] Fix errors in tests

---
 .../src/button/SaveButton.spec.tsx            | 33 ++++++++++++++-----
 .../src/field/ArrayField.spec.tsx             |  4 ++-
 .../ra-ui-materialui/src/list/List.spec.tsx   |  9 +++--
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/packages/ra-ui-materialui/src/button/SaveButton.spec.tsx b/packages/ra-ui-materialui/src/button/SaveButton.spec.tsx
index 5ec4bc7c2a6..b1e27d4ea48 100644
--- a/packages/ra-ui-materialui/src/button/SaveButton.spec.tsx
+++ b/packages/ra-ui-materialui/src/button/SaveButton.spec.tsx
@@ -56,7 +56,9 @@ describe('<SaveButton />', () => {
             <TestContext>
                 <ThemeProvider theme={theme}>
                     <SaveContextProvider value={saveContextValue}>
-                        <SaveButton {...invalidButtonDomProps} />
+                        <FormContextProvider value={formContextValue}>
+                            <SaveButton {...invalidButtonDomProps} />
+                        </FormContextProvider>
                     </SaveContextProvider>
                 </ThemeProvider>
             </TestContext>
@@ -75,7 +77,9 @@ describe('<SaveButton />', () => {
             <TestContext>
                 <ThemeProvider theme={theme}>
                     <SaveContextProvider value={saveContextValue}>
-                        <SaveButton disabled={true} />
+                        <FormContextProvider value={formContextValue}>
+                            <SaveButton disabled={true} />
+                        </FormContextProvider>
                     </SaveContextProvider>
                 </ThemeProvider>
             </TestContext>
@@ -87,7 +91,9 @@ describe('<SaveButton />', () => {
         const { getByLabelText } = render(
             <TestContext>
                 <SaveContextProvider value={saveContextValue}>
-                    <SaveButton submitOnEnter />
+                    <FormContextProvider value={formContextValue}>
+                        <SaveButton submitOnEnter />
+                    </FormContextProvider>
                 </SaveContextProvider>
             </TestContext>
         );
@@ -100,7 +106,9 @@ describe('<SaveButton />', () => {
         const { getByLabelText } = render(
             <TestContext>
                 <SaveContextProvider value={saveContextValue}>
-                    <SaveButton submitOnEnter={false} />
+                    <FormContextProvider value={formContextValue}>
+                        <SaveButton submitOnEnter={false} />
+                    </FormContextProvider>
                 </SaveContextProvider>
             </TestContext>
         );
@@ -135,7 +143,12 @@ describe('<SaveButton />', () => {
         const { getByLabelText } = render(
             <TestContext>
                 <SaveContextProvider value={saveContextValue}>
-                    <SaveButton handleSubmitWithRedirect={onSubmit} saving />
+                    <FormContextProvider value={formContextValue}>
+                        <SaveButton
+                            handleSubmitWithRedirect={onSubmit}
+                            saving
+                        />
+                    </FormContextProvider>
                 </SaveContextProvider>
             </TestContext>
         );
@@ -154,10 +167,12 @@ describe('<SaveButton />', () => {
                     dispatchSpy = jest.spyOn(store, 'dispatch');
                     return (
                         <SaveContextProvider value={saveContextValue}>
-                            <SaveButton
-                                handleSubmitWithRedirect={onSubmit}
-                                invalid
-                            />
+                            <FormContextProvider value={formContextValue}>
+                                <SaveButton
+                                    handleSubmitWithRedirect={onSubmit}
+                                    invalid
+                                />
+                            </FormContextProvider>
                         </SaveContextProvider>
                     );
                 }}
diff --git a/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx b/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx
index d5beeb5dd35..86edf726eb6 100644
--- a/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx
+++ b/packages/ra-ui-materialui/src/field/ArrayField.spec.tsx
@@ -8,8 +8,10 @@ import TextField from './TextField';
 import Datagrid from '../list/datagrid/Datagrid';
 
 describe('<ArrayField />', () => {
+    const currentSort = { field: 'id', order: 'ASC' };
+
     const DummyIterator = props => (
-        <Datagrid {...props}>
+        <Datagrid {...props} currentSort={currentSort}>
             <NumberField source="id" />
             <TextField source="foo" />
         </Datagrid>
diff --git a/packages/ra-ui-materialui/src/list/List.spec.tsx b/packages/ra-ui-materialui/src/list/List.spec.tsx
index 2453c44bcba..7b3136e6fb0 100644
--- a/packages/ra-ui-materialui/src/list/List.spec.tsx
+++ b/packages/ra-ui-materialui/src/list/List.spec.tsx
@@ -50,7 +50,8 @@ describe('<List />', () => {
                 <List {...defaultProps}>
                     <Datagrid />
                 </List>
-            </ThemeProvider>
+            </ThemeProvider>,
+            defaultStateForList
         );
         expect(container.querySelectorAll('.list-page')).toHaveLength(1);
     });
@@ -70,7 +71,8 @@ describe('<List />', () => {
                         <Datagrid />
                     </List>
                 </MemoryRouter>
-            </ThemeProvider>
+            </ThemeProvider>,
+            defaultStateForList
         );
         expect(queryAllByText('filters')).toHaveLength(2);
         expect(queryAllByLabelText('ra.action.export')).toHaveLength(1);
@@ -86,7 +88,8 @@ describe('<List />', () => {
                 <List {...defaultProps} aside={<Aside />}>
                     <Dummy />
                 </List>
-            </ThemeProvider>
+            </ThemeProvider>,
+            defaultStateForList
         );
         expect(queryAllByText('Hello')).toHaveLength(1);
     });