diff --git a/packages/core/admin/admin/src/hooks/useSettingsForm/index.js b/packages/core/admin/admin/src/hooks/useSettingsForm/index.js index eadd17018c..6496a3ed2b 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsForm/index.js +++ b/packages/core/admin/admin/src/hooks/useSettingsForm/index.js @@ -90,7 +90,7 @@ const useSettingsForm = (endPoint, schema, cbSuccess, fieldsToPick) => { type: 'ON_SUBMIT', }); const cleanedData = omit(modifiedData, ['confirmPassword', 'registrationToken']); - + if (cleanedData.roles) { cleanedData.roles = cleanedData.roles.map((role) => role.id); } diff --git a/packages/core/admin/admin/src/hooks/useSettingsForm/tests/index.test.js b/packages/core/admin/admin/src/hooks/useSettingsForm/tests/index.test.js index 38a1d9a905..529649c246 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsForm/tests/index.test.js +++ b/packages/core/admin/admin/src/hooks/useSettingsForm/tests/index.test.js @@ -3,7 +3,6 @@ import { setupServer } from 'msw/node'; import { rest } from 'msw'; import { renderHook, act } from '@testing-library/react-hooks'; import { IntlProvider } from 'react-intl'; -import omit from 'lodash/omit'; import useSettingsForm from '../index'; const toggleNotification = jest.fn(); @@ -19,7 +18,7 @@ jest.mock('../../../utils', () => ({ checkFormValidity: () => (null), })); -jest.mock('lodash/omit'); +// jest.mock('lodash/omit'); const handlers = [ rest.put('*/providers/options', (req, res, ctx) => @@ -105,13 +104,23 @@ describe('useSettingsForm', () => { }); test('submit new providers options with duplications', async () => { - const cbSucc = jest.fn(); const ssoLockedRolesWithDuplications = [ '1', '2', '2', '3' ]; - omit.mockReturnValueOnce({ - autoRegister: false, - defaultRole: '1', - ssoLockedRoles: ssoLockedRolesWithDuplications - }); + server.use( + rest.get('*/providers/options', (req, res, ctx) => + res.once( + ctx.status(200), + ctx.json({ + data: { + autoRegister: false, + defaultRole: "1", + ssoLockedRoles: ssoLockedRolesWithDuplications + } + }) + ) + ) + ) + + const cbSucc = jest.fn(); const { result, waitFor } = setup('/admin/providers/options', {}, cbSucc, ['autoRegister', 'defaultRole', 'ssoLockedRoles'] ); await waitFor(() => expect(result.current[0].isLoading).toBe(false));