diff --git a/apps/meteor/client/components/GazzodownText.spec.tsx b/apps/meteor/client/components/GazzodownText.spec.tsx index 3e41da52b9c..2bf9c746b5b 100644 --- a/apps/meteor/client/components/GazzodownText.spec.tsx +++ b/apps/meteor/client/components/GazzodownText.spec.tsx @@ -50,7 +50,7 @@ describe('GazzodownText highlights', () => { , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); // Expect that the highlighted element wraps exactly "тест" expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^тест$/i); @@ -63,7 +63,7 @@ describe('GazzodownText highlights', () => { , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^тест$/i); }); @@ -75,7 +75,7 @@ describe('GazzodownText highlights', () => { , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); expect(screen.queryByTitle('Highlighted_chosen_word')).not.toBeInTheDocument(); }); @@ -87,7 +87,7 @@ describe('GazzodownText highlights', () => { , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^тест$/i); }); @@ -99,7 +99,7 @@ describe('GazzodownText highlights', () => { , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^test$/i); }); @@ -111,7 +111,7 @@ describe('GazzodownText highlights', () => { , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); const highlightedElements = screen.getAllByTitle('Highlighted_chosen_word'); // Expect three separate highlights. @@ -133,7 +133,7 @@ in it.`; , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); const highlightedElements = screen.getAllByTitle('Highlighted_chosen_word'); // At least two occurrences are expected: one for "Test" (capitalized) and one for "test" @@ -151,7 +151,7 @@ in it.`; , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); // The highlighted element should contain only "test" expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^test$/i); @@ -164,7 +164,7 @@ in it.`; , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); // The highlighted element should contain only "test" expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^test$/i); @@ -177,7 +177,7 @@ in it.`; , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); // The highlighted element should contain only "test" expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^test$/i); @@ -190,7 +190,7 @@ in it.`; , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); const highlightedElements = screen.getAllByTitle('Highlighted_chosen_word'); @@ -209,7 +209,7 @@ in it.`; , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^te-st_te\.st\/te=te!st:$/i); @@ -222,7 +222,7 @@ in it.`; , - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); expect(screen.getByTitle('Highlighted_chosen_word')).toHaveTextContent(/^test$/i); }); diff --git a/apps/meteor/client/components/message/variants/SystemMessage.spec.tsx b/apps/meteor/client/components/message/variants/SystemMessage.spec.tsx index c0482e831db..9df7e766944 100644 --- a/apps/meteor/client/components/message/variants/SystemMessage.spec.tsx +++ b/apps/meteor/client/components/message/variants/SystemMessage.spec.tsx @@ -56,7 +56,7 @@ describe('SystemMessage', () => { it('should render system message', () => { const message = createBaseMessage('& test &'); - render(, { legacyRoot: true, wrapper: wrapper.build() }); + render(, { wrapper: wrapper.build() }); expect(screen.getByText('changed room description to: & test &')).toBeInTheDocument(); }); @@ -64,7 +64,7 @@ describe('SystemMessage', () => { it('should not show escaped html while rendering system message', () => { const message = createBaseMessage('& test &'); - render(, { legacyRoot: true, wrapper: wrapper.build() }); + render(, { wrapper: wrapper.build() }); expect(screen.getByText('changed room description to: & test &')).toBeInTheDocument(); expect(screen.queryByText('changed room description to: & test &')).not.toBeInTheDocument(); @@ -73,7 +73,7 @@ describe('SystemMessage', () => { it('should not inject html', () => { const message = createBaseMessage(''); - render(, { legacyRoot: true, wrapper: wrapper.build() }); + render(, { wrapper: wrapper.build() }); expect(screen.queryByTitle('test-title')).not.toBeInTheDocument(); expect(screen.getByText('changed room description to: ')).toBeInTheDocument(); diff --git a/apps/meteor/client/hooks/useUserCustomFields.spec.tsx b/apps/meteor/client/hooks/useUserCustomFields.spec.tsx index 4c38adc2f3e..c27ec3d769d 100644 --- a/apps/meteor/client/hooks/useUserCustomFields.spec.tsx +++ b/apps/meteor/client/hooks/useUserCustomFields.spec.tsx @@ -10,7 +10,6 @@ it('should not break with invalid Accounts_CustomFieldsToShowInUserInfo setting' prop: 'value', }), { - legacyRoot: true, wrapper: mockAppRoot() .withSetting('Accounts_CustomFieldsToShowInUserInfo', '{"Invalid": "Object", "InvalidProperty": "Invalid" }') .build(), diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.spec.ts b/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.spec.ts index 906885b2ebe..1922ed22958 100644 --- a/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.spec.ts +++ b/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.spec.ts @@ -56,7 +56,6 @@ it('should return utc time', async () => { }, }; const { result } = renderHook(() => useMessagesSent({ period: 'this week', utc: true }), { - legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/engagement-dashboard/messages/messages-sent', () => expectedResult) .build(), @@ -117,7 +116,6 @@ it.skip('should return local time', async () => { }, }; const { result } = renderHook(() => useMessagesSent({ period: 'this week', utc: false }), { - legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/engagement-dashboard/messages/messages-sent', () => expectedResult) .build(), diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.spec.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.spec.ts index e27e0fe6e2c..2b5183bd289 100644 --- a/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.spec.ts +++ b/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.spec.ts @@ -22,7 +22,6 @@ it('should return utc time', async () => { success: true, }; const { result } = renderHook(() => useHourlyChatActivity({ displacement: 0, utc: true }), { - legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/engagement-dashboard/users/chat-busier/hourly-data', () => expectedResult) .build(), @@ -76,7 +75,6 @@ it.skip('should return local time', async () => { }; const { result } = renderHook(() => useHourlyChatActivity({ displacement: 0, utc: false }), { - legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/engagement-dashboard/users/chat-busier/hourly-data', () => receivedData) .build(), diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.spec.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.spec.ts index e1da1410538..6d59f392505 100644 --- a/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.spec.ts +++ b/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.spec.ts @@ -56,7 +56,6 @@ it('should return utc time', async () => { }, }; const { result } = renderHook(() => useNewUsers({ period: 'this week', utc: true }), { - legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/engagement-dashboard/users/new-users', () => expectedResult) .build(), @@ -117,7 +116,6 @@ it.skip('should return local time', async () => { }, }; const { result } = renderHook(() => useNewUsers({ period: 'this week', utc: false }), { - legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/engagement-dashboard/users/new-users', () => expectedResult) .build(), diff --git a/apps/meteor/client/views/hooks/useMemberList.spec.tsx b/apps/meteor/client/views/hooks/useMemberList.spec.tsx index 88aa47c0760..2d762c5268b 100644 --- a/apps/meteor/client/views/hooks/useMemberList.spec.tsx +++ b/apps/meteor/client/views/hooks/useMemberList.spec.tsx @@ -85,7 +85,7 @@ describe('useMembersList', () => { debouncedText: '', roomType: 'c', }), - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); await expect(result.current.isLoading).toBe(true); @@ -107,7 +107,7 @@ describe('useMembersList', () => { debouncedText: '', roomType: 'p', }), - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); expect(result.current.isLoading).toBe(true); @@ -130,7 +130,7 @@ describe('useMembersList', () => { debouncedText: '', roomType: 'd', }), - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); await waitFor(() => expect(result.current.isLoading).toBe(false)); @@ -152,7 +152,6 @@ describe('useMembersList', () => { roomType: 'c', }), { - legacyRoot: true, wrapper: wrapper .withEndpoint('GET', '/v1/rooms.membersOrderedByRole', ({ offset }) => { if (offset === 0) { @@ -199,7 +198,7 @@ describe('useMembersList', () => { debouncedText: '', roomType: 'c', }), - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); await waitFor(() => expect(subscribeMock).toHaveBeenCalledWith('roles-change', expect.any(Function))); @@ -229,7 +228,7 @@ describe('useMembersList', () => { debouncedText: '', roomType: 'c', }), - { legacyRoot: true, wrapper: wrapper.build() }, + { wrapper: wrapper.build() }, ); await waitFor(() => expect(result.current.isLoading).toBe(false)); @@ -285,7 +284,6 @@ describe('useMembersList', () => { roomType: 'c', }), { - legacyRoot: true, wrapper: wrapper.withEndpoint('GET', '/v1/rooms.membersOrderedByRole', (_params) => customPage as any).build(), }, ); @@ -362,7 +360,7 @@ describe('useMembersList', () => { debouncedText: '', roomType: 'c', }), - { legacyRoot: true, wrapper: testWrapper.build() }, + { wrapper: testWrapper.build() }, ); // Page 1 diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.spec.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.spec.tsx index d6bae87ccc5..da8f0eaad32 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.spec.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.spec.tsx @@ -62,7 +62,6 @@ describe('AppDetailsPage', () => { it('should not display the Save button initially', async () => { render(, { wrapper: wrapper.build(), - legacyRoot: true, }); await waitFor(() => { @@ -73,7 +72,6 @@ describe('AppDetailsPage', () => { it('should display the Save button when a setting is changed', async () => { render(, { wrapper: wrapper.build(), - legacyRoot: true, }); const settingInput = screen.getByLabelText('setting1'); @@ -90,7 +88,6 @@ describe('AppDetailsPage', () => { render(, { wrapper: wrapper.build(), - legacyRoot: true, }); const settingInput = screen.getByLabelText('setting1'); @@ -111,7 +108,6 @@ describe('AppDetailsPage', () => { render(, { wrapper: wrapper.build(), - legacyRoot: true, }); const settingInput = screen.getByLabelText('setting1'); @@ -131,7 +127,6 @@ describe('AppDetailsPage', () => { render(, { wrapper: wrapper.build(), - legacyRoot: true, }); const settingInput = screen.getByLabelText('setting1'); diff --git a/packages/ui-client/src/hooks/useUserDisplayName.spec.ts b/packages/ui-client/src/hooks/useUserDisplayName.spec.ts index a4ed61fbc9b..8dc0e6e739f 100644 --- a/packages/ui-client/src/hooks/useUserDisplayName.spec.ts +++ b/packages/ui-client/src/hooks/useUserDisplayName.spec.ts @@ -10,7 +10,6 @@ const fakeUser = { it('should return username if UI_Use_Real_Name setting is false', () => { const { result } = renderHook(() => useUserDisplayName(fakeUser), { - legacyRoot: true, wrapper: mockAppRoot().withSetting('UI_Use_Real_Name', false).build(), }); @@ -19,7 +18,6 @@ it('should return username if UI_Use_Real_Name setting is false', () => { it('should return name if UI_Use_Real_Name setting is true', () => { const { result } = renderHook(() => useUserDisplayName(fakeUser), { - legacyRoot: true, wrapper: mockAppRoot().withSetting('UI_Use_Real_Name', true).build(), }); @@ -28,7 +26,6 @@ it('should return name if UI_Use_Real_Name setting is true', () => { it('should return username if UI_Use_Real_Name setting is true and user has no name', () => { const { result } = renderHook(() => useUserDisplayName({ ...fakeUser, name: undefined }), { - legacyRoot: true, wrapper: mockAppRoot().withSetting('UI_Use_Real_Name', true).build(), });