From 0fb400770fe6cee74034d9a51b09e3b7e41764c0 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 16:26:37 +0000 Subject: [PATCH 01/24] Test for #9655 --- .../BulkUpdateWithConfirmButton.spec.tsx | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx new file mode 100644 index 00000000000..4e404717619 --- /dev/null +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -0,0 +1,65 @@ +import { screen, render, waitFor, fireEvent } from '@testing-library/react'; +import expect from 'expect'; +import { CoreAdminContext, MutationMode, testDataProvider } from 'ra-core'; +import { createTheme, ThemeProvider } from '@mui/material/styles'; + +import { UpdateWithConfirmButton } from './UpdateWithConfirmButton'; +import { Toolbar, SimpleForm } from '../form'; +import { Edit } from '../detail'; +import { TextInput } from '../input'; +import { Notification } from '../layout'; +import { MutationOptions } from './UpdateButton.stories'; + +const theme = createTheme(); + +describe('', () => { + const defaultEditProps = { + id: '123', + resource: 'posts', + location: {}, + match: {}, + mutationMode: 'pessimistic' as MutationMode, + }; + + it('should close the confirmation dialog after confirm', async () => { + const dataProvider = testDataProvider({ + // @ts-ignore + getOne: () => + Promise.resolve({ + data: { id: 123, title: 'lorem' }, + }), + update: jest.fn().mockResolvedValueOnce({ data: { id: 123 } }), + }); + const EditToolbar = props => ( + + + + ); + render( + + + <> + + }> + + + + + + + + ); + expect(await screen.findByText('lorem')).toBeInTheDocument(); + fireEvent.click(screen.getByLabelText('ra.action.update')); + expect(await screen.findByText('Update 1 posts')).toBeInTheDocument(); + fireEvent.click(screen.getByText('ra.action.confirm')); + + await waitFor(() => { + expect(screen.queryByText('Update 1 posts')).not.toBeInTheDocument(); + }); + expect(screen.getByText('foobar')).toBeInTheDocument(); + }); +}); From 86d3093bb41cebb96a7766ed3c7f6b0137d9c49a Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 16:50:54 +0000 Subject: [PATCH 02/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 4e404717619..c58817f2d61 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -1,3 +1,4 @@ +import * as React from 'react'; import { screen, render, waitFor, fireEvent } from '@testing-library/react'; import expect from 'expect'; import { CoreAdminContext, MutationMode, testDataProvider } from 'ra-core'; From e8c43697a92eb46ea8ce8d8f4506b2fb6c6e0ba2 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 16:51:22 +0000 Subject: [PATCH 03/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index c58817f2d61..0146188375f 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -4,7 +4,7 @@ import expect from 'expect'; import { CoreAdminContext, MutationMode, testDataProvider } from 'ra-core'; import { createTheme, ThemeProvider } from '@mui/material/styles'; -import { UpdateWithConfirmButton } from './UpdateWithConfirmButton'; +import { BulkUpdateWithConfirmButton } from './BulkUpdateWithConfirmButton'; import { Toolbar, SimpleForm } from '../form'; import { Edit } from '../detail'; import { TextInput } from '../input'; From eb2df6b3260b2f543d8aa2c4d3b85c8c9acf002b Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 17:05:46 +0000 Subject: [PATCH 04/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 0146188375f..52760d64b06 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -9,7 +9,6 @@ import { Toolbar, SimpleForm } from '../form'; import { Edit } from '../detail'; import { TextInput } from '../input'; import { Notification } from '../layout'; -import { MutationOptions } from './UpdateButton.stories'; const theme = createTheme(); @@ -54,12 +53,19 @@ describe('', () => { ); expect(await screen.findByText('lorem')).toBeInTheDocument(); + const checkContainer = screen.getByRole("columnheader", {"name": "Select all"}); + const check = within(checkContainer).getByRole("checkbox"); + fireEvent.click(check); + expect(check).toBeChecked(); + fireEvent.click(screen.getByLabelText('ra.action.update')); expect(await screen.findByText('Update 1 posts')).toBeInTheDocument(); fireEvent.click(screen.getByText('ra.action.confirm')); await waitFor(() => { - expect(screen.queryByText('Update 1 posts')).not.toBeInTheDocument(); + expect( + screen.queryByText('Update 1 posts') + ).not.toBeInTheDocument(); }); expect(screen.getByText('foobar')).toBeInTheDocument(); }); From da327b5b733f07cf146daeb368f53e40fb6adc59 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 17:15:39 +0000 Subject: [PATCH 05/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 52760d64b06..20bac375678 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -22,13 +22,14 @@ describe('', () => { }; it('should close the confirmation dialog after confirm', async () => { + const record = { id: 123, title: 'lorem' }; const dataProvider = testDataProvider({ // @ts-ignore - getOne: () => - Promise.resolve({ - data: { id: 123, title: 'lorem' }, - }), - update: jest.fn().mockResolvedValueOnce({ data: { id: 123 } }), + getOne: () => Promise.resolve({ data: record, }), + updateMany: (p) => { + record.title = p.data.title; + return p.ids; + }, }); const EditToolbar = props => ( From 13bc7be5f7bcb8a2fc95d856e649ef995173b336 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 17:26:50 +0000 Subject: [PATCH 06/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../BulkUpdateWithConfirmButton.spec.tsx | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 20bac375678..6dd7fa288df 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -24,32 +24,30 @@ describe('', () => { it('should close the confirmation dialog after confirm', async () => { const record = { id: 123, title: 'lorem' }; const dataProvider = testDataProvider({ - // @ts-ignore - getOne: () => Promise.resolve({ data: record, }), + getMany: () => Promise.resolve({ data: [record], total: 1 }), updateMany: (p) => { record.title = p.data.title; return p.ids; }, }); - const EditToolbar = props => ( - + const ActionButtons = props => ( + <> - + ); render( - <> - - }> - - - - - + + }> + + + ); From a942ae2981bc12bf3ac0b70e7d4e46b884122931 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 17:33:38 +0000 Subject: [PATCH 07/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../BulkUpdateWithConfirmButton.spec.tsx | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 6dd7fa288df..8f3e5a00ce3 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -1,26 +1,21 @@ import * as React from 'react'; import { screen, render, waitFor, fireEvent } from '@testing-library/react'; import expect from 'expect'; -import { CoreAdminContext, MutationMode, testDataProvider } from 'ra-core'; +import { + CoreAdminContext, + ListContextProvider, + MutationMode, + testDataProvider +} from 'ra-core'; import { createTheme, ThemeProvider } from '@mui/material/styles'; import { BulkUpdateWithConfirmButton } from './BulkUpdateWithConfirmButton'; -import { Toolbar, SimpleForm } from '../form'; -import { Edit } from '../detail'; -import { TextInput } from '../input'; -import { Notification } from '../layout'; +import { Datagrid } from '../list'; +import { TextField } from '../field'; const theme = createTheme(); describe('', () => { - const defaultEditProps = { - id: '123', - resource: 'posts', - location: {}, - match: {}, - mutationMode: 'pessimistic' as MutationMode, - }; - it('should close the confirmation dialog after confirm', async () => { const record = { id: 123, title: 'lorem' }; const dataProvider = testDataProvider({ @@ -30,7 +25,7 @@ describe('', () => { return p.ids; }, }); - const ActionButtons = props => ( + const ActionButtons = () => ( <> ', () => { render( - + }> From 311ef57ad791c6fab42d6ed823be3f479bf99518 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 17:44:18 +0000 Subject: [PATCH 08/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 8f3e5a00ce3..841c36b9206 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -4,8 +4,7 @@ import expect from 'expect'; import { CoreAdminContext, ListContextProvider, - MutationMode, - testDataProvider + testDataProvider, } from 'ra-core'; import { createTheme, ThemeProvider } from '@mui/material/styles'; @@ -20,7 +19,8 @@ describe('', () => { const record = { id: 123, title: 'lorem' }; const dataProvider = testDataProvider({ getMany: () => Promise.resolve({ data: [record], total: 1 }), - updateMany: (p) => { + getOne: () => Promise.resolve({ data: record }), + updateMany: p => { record.title = p.data.title; return p.ids; }, @@ -45,8 +45,10 @@ describe('', () => { ); expect(await screen.findByText('lorem')).toBeInTheDocument(); - const checkContainer = screen.getByRole("columnheader", {"name": "Select all"}); - const check = within(checkContainer).getByRole("checkbox"); + const checkContainer = screen.getByRole('columnheader', { + name: 'Select all' + }); + const check = within(checkContainer).getByRole('checkbox'); fireEvent.click(check); expect(check).toBeChecked(); From e611de54d89bc5414ee7b7d7ad0ef5fde01d3fed Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 18:00:29 +0000 Subject: [PATCH 09/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../button/BulkUpdateWithConfirmButton.spec.tsx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 841c36b9206..57349b6c340 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -4,6 +4,7 @@ import expect from 'expect'; import { CoreAdminContext, ListContextProvider, + ResourceContextProvider, testDataProvider, } from 'ra-core'; import { createTheme, ThemeProvider } from '@mui/material/styles'; @@ -36,17 +37,19 @@ describe('', () => { render( - - }> - - - + + + }> + + + + ); expect(await screen.findByText('lorem')).toBeInTheDocument(); const checkContainer = screen.getByRole('columnheader', { - name: 'Select all' + name: 'Select all', }); const check = within(checkContainer).getByRole('checkbox'); fireEvent.click(check); From d2b0decf9559ebed20670c77e6f8b7dc185b5929 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 18:15:05 +0000 Subject: [PATCH 10/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 57349b6c340..b62b8f29c1a 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -19,7 +19,7 @@ describe('', () => { it('should close the confirmation dialog after confirm', async () => { const record = { id: 123, title: 'lorem' }; const dataProvider = testDataProvider({ - getMany: () => Promise.resolve({ data: [record], total: 1 }), + getList: () => Promise.resolve({ data: [record], total: 1 }), getOne: () => Promise.resolve({ data: record }), updateMany: p => { record.title = p.data.title; From 6dd16731bbc3790edc748acc4814c56eedc12f5a Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sun, 11 Feb 2024 18:26:15 +0000 Subject: [PATCH 11/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index b62b8f29c1a..e05540f95a8 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -20,6 +20,7 @@ describe('', () => { const record = { id: 123, title: 'lorem' }; const dataProvider = testDataProvider({ getList: () => Promise.resolve({ data: [record], total: 1 }), + getMany: () => Promise.resolve({ data: [record] }), getOne: () => Promise.resolve({ data: record }), updateMany: p => { record.title = p.data.title; From 253a8f912227ba3b5aea2bacad8f48280c09438e Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 13:40:49 +0000 Subject: [PATCH 12/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index e05540f95a8..f940c7d5f18 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -39,11 +39,11 @@ describe('', () => { - + }> - + From cf61720face3188f740ec0b38efdd6efeefb3acf Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 13:44:11 +0000 Subject: [PATCH 13/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index f940c7d5f18..7d4d05f11d8 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -3,7 +3,7 @@ import { screen, render, waitFor, fireEvent } from '@testing-library/react'; import expect from 'expect'; import { CoreAdminContext, - ListContextProvider, + ListBase, ResourceContextProvider, testDataProvider, } from 'ra-core'; From 21770b969e33e331bb828cdef5d083548e46e14e Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 14:01:19 +0000 Subject: [PATCH 14/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 7d4d05f11d8..64e67bd0a5e 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -48,7 +48,7 @@ describe('', () => { ); - expect(await screen.findByText('lorem')).toBeInTheDocument(); + expect(await screen.findByText('lorem')).toBeDefined(); const checkContainer = screen.getByRole('columnheader', { name: 'Select all', }); @@ -57,14 +57,12 @@ describe('', () => { expect(check).toBeChecked(); fireEvent.click(screen.getByLabelText('ra.action.update')); - expect(await screen.findByText('Update 1 posts')).toBeInTheDocument(); + expect(await screen.findByText('Update 1 posts')).toBeDefined(); fireEvent.click(screen.getByText('ra.action.confirm')); await waitFor(() => { - expect( - screen.queryByText('Update 1 posts') - ).not.toBeInTheDocument(); + expect(screen.queryByText('Update 1 posts')).toBeNull(); }); - expect(screen.getByText('foobar')).toBeInTheDocument(); + expect(screen.getByText('foobar')).toBeDefined(); }); }); From 87882c8ed6e39d318a7a202b3bdbf62a3f4f4b61 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 14:15:57 +0000 Subject: [PATCH 15/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 64e67bd0a5e..53f2f6ceac6 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -49,7 +49,7 @@ describe('', () => { ); expect(await screen.findByText('lorem')).toBeDefined(); - const checkContainer = screen.getByRole('columnheader', { + const checkContainer = await screen.findByRole('columnheader', { name: 'Select all', }); const check = within(checkContainer).getByRole('checkbox'); From ae5b6852dfe990a7dff7fb74c39717753635aaf7 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 14:57:44 +0000 Subject: [PATCH 16/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 53f2f6ceac6..7ce4dba4b36 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -3,7 +3,7 @@ import { screen, render, waitFor, fireEvent } from '@testing-library/react'; import expect from 'expect'; import { CoreAdminContext, - ListBase, + List, ResourceContextProvider, testDataProvider, } from 'ra-core'; @@ -39,17 +39,17 @@ describe('', () => { - + }> - + ); expect(await screen.findByText('lorem')).toBeDefined(); - const checkContainer = await screen.findByRole('columnheader', { + const checkContainer = screen.getByRole('columnheader', { name: 'Select all', }); const check = within(checkContainer).getByRole('checkbox'); From f81d29259340d368ba8abba43f2288077446e3fa Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 15:18:44 +0000 Subject: [PATCH 17/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 7ce4dba4b36..35698a013ab 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -3,7 +3,7 @@ import { screen, render, waitFor, fireEvent } from '@testing-library/react'; import expect from 'expect'; import { CoreAdminContext, - List, + ListBase, ResourceContextProvider, testDataProvider, } from 'ra-core'; @@ -39,19 +39,17 @@ describe('', () => { - + }> - + ); expect(await screen.findByText('lorem')).toBeDefined(); - const checkContainer = screen.getByRole('columnheader', { - name: 'Select all', - }); + const checkContainer = screen.getByAllRole('columnheader')[0]; const check = within(checkContainer).getByRole('checkbox'); fireEvent.click(check); expect(check).toBeChecked(); From 2c2baf671e9e28f897a39453d7bc91118fb1e139 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 15:36:10 +0000 Subject: [PATCH 18/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 35698a013ab..001f9207df2 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -49,7 +49,7 @@ describe('', () => { ); expect(await screen.findByText('lorem')).toBeDefined(); - const checkContainer = screen.getByAllRole('columnheader')[0]; + const checkContainer = screen.getAllByRole('columnheader')[0]; const check = within(checkContainer).getByRole('checkbox'); fireEvent.click(check); expect(check).toBeChecked(); From cecb441b1e17524814728a0efef9a3201c2b41e0 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 16:02:27 +0000 Subject: [PATCH 19/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 001f9207df2..c3469ca7333 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen, render, waitFor, fireEvent } from '@testing-library/react'; +import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'; import expect from 'expect'; import { CoreAdminContext, From 25523defe092973f440780dd4239a48b43b77095 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 16:17:03 +0000 Subject: [PATCH 20/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index c3469ca7333..6188770ffd8 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -1,5 +1,11 @@ import * as React from 'react'; -import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'; +import { + fireEvent, + render, + screen, + waitFor, + within +} from '@testing-library/react'; import expect from 'expect'; import { CoreAdminContext, @@ -52,7 +58,7 @@ describe('', () => { const checkContainer = screen.getAllByRole('columnheader')[0]; const check = within(checkContainer).getByRole('checkbox'); fireEvent.click(check); - expect(check).toBeChecked(); + expect(check).toHaveProperty('aria-checked', true); fireEvent.click(screen.getByLabelText('ra.action.update')); expect(await screen.findByText('Update 1 posts')).toBeDefined(); From 5cf525cadb00fe7d91bd2cb875f6a080fdd6f54c Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 16:27:20 +0000 Subject: [PATCH 21/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 6188770ffd8..de4927879cc 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -4,7 +4,7 @@ import { render, screen, waitFor, - within + within, } from '@testing-library/react'; import expect from 'expect'; import { @@ -58,7 +58,6 @@ describe('', () => { const checkContainer = screen.getAllByRole('columnheader')[0]; const check = within(checkContainer).getByRole('checkbox'); fireEvent.click(check); - expect(check).toHaveProperty('aria-checked', true); fireEvent.click(screen.getByLabelText('ra.action.update')); expect(await screen.findByText('Update 1 posts')).toBeDefined(); From e144f1109ef2617f64777a3dba9aa82728c1358c Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 16:37:43 +0000 Subject: [PATCH 22/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index de4927879cc..88d12721b41 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -57,9 +57,10 @@ describe('', () => { expect(await screen.findByText('lorem')).toBeDefined(); const checkContainer = screen.getAllByRole('columnheader')[0]; const check = within(checkContainer).getByRole('checkbox'); - fireEvent.click(check); + //fireEvent.click(check); fireEvent.click(screen.getByLabelText('ra.action.update')); + screen.debug(undefined, Infinity); expect(await screen.findByText('Update 1 posts')).toBeDefined(); fireEvent.click(screen.getByText('ra.action.confirm')); From 94852423f369d223c3334ef7bc6835ac3a3b7202 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 24 Feb 2024 16:50:38 +0000 Subject: [PATCH 23/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 88d12721b41..308f4aca83d 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -57,15 +57,15 @@ describe('', () => { expect(await screen.findByText('lorem')).toBeDefined(); const checkContainer = screen.getAllByRole('columnheader')[0]; const check = within(checkContainer).getByRole('checkbox'); - //fireEvent.click(check); + fireEvent.click(check); fireEvent.click(screen.getByLabelText('ra.action.update')); screen.debug(undefined, Infinity); - expect(await screen.findByText('Update 1 posts')).toBeDefined(); + expect(await screen.findByText('ra.message.bulk_update_title')).toBeDefined(); fireEvent.click(screen.getByText('ra.action.confirm')); await waitFor(() => { - expect(screen.queryByText('Update 1 posts')).toBeNull(); + expect(screen.queryByText('ra.message.bulk_update_title')).toBeNull(); }); expect(screen.getByText('foobar')).toBeDefined(); }); From 102c910e2661d79ceacc6c25e86d1e080c18b3e3 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Mon, 22 Apr 2024 20:35:35 +0100 Subject: [PATCH 24/24] Update BulkUpdateWithConfirmButton.spec.tsx --- .../src/button/BulkUpdateWithConfirmButton.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx index 308f4aca83d..98cb7839d69 100644 --- a/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx +++ b/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.spec.tsx @@ -36,7 +36,7 @@ describe('', () => { const ActionButtons = () => ( <>