mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
[React18] Migrate test suites to account for testing library upgrades kibana-security (#201151)
This PR migrates test suites that use `renderHook` from the library `@testing-library/react-hooks` to adopt the equivalent and replacement of `renderHook` from the export that is now available from `@testing-library/react`. This work is required for the planned migration to react18. ## Context In this PR, usages of `waitForNextUpdate` that previously could have been destructured from `renderHook` are now been replaced with `waitFor` exported from `@testing-library/react`, furthermore `waitFor` that would also have been destructured from the same renderHook result is now been replaced with `waitFor` from the export of `@testing-library/react`. ***Why is `waitFor` a sufficient enough replacement for `waitForNextUpdate`, and better for testing values subject to async computations?*** WaitFor will retry the provided callback if an error is returned, till the configured timeout elapses. By default the retry interval is `50ms` with a timeout value of `1000ms` that effectively translates to at least 20 retries for assertions placed within waitFor. See https://testing-library.com/docs/dom-testing-library/api-async/#waitfor for more information. This however means that for person's writing tests, said person has to be explicit about expectations that describe the internal state of the hook being tested. This implies checking for instance when a react query hook is being rendered, there's an assertion that said hook isn't loading anymore. In this PR you'd notice that this pattern has been adopted, with most existing assertions following an invocation of `waitForNextUpdate` being placed within a `waitFor` invocation. In some cases the replacement is simply a `waitFor(() => new Promise((resolve) => resolve(null)))` (many thanks to @kapral18, for point out exactly why this works), where this suffices the assertions that follow aren't placed within a waitFor so this PR doesn't get larger than it needs to be. It's also worth pointing out this PR might also contain changes to test and application code to improve said existing test. ### What to do next? 1. Review the changes in this PR. 2. If you think the changes are correct, approve the PR. ## Any questions? If you have any questions or need help with this PR, please leave comments in this PR. Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
parent
a9f78e4a28
commit
f0540977af
9 changed files with 41 additions and 43 deletions
|
@ -7,7 +7,7 @@
|
|||
* License v3.0 only", or the "Server Side Public License, v 1".
|
||||
*/
|
||||
|
||||
import { act, renderHook, type WrapperComponent } from '@testing-library/react-hooks';
|
||||
import { act, renderHook, waitFor } from '@testing-library/react';
|
||||
import React from 'react';
|
||||
import { BehaviorSubject, first, lastValueFrom, of } from 'rxjs';
|
||||
|
||||
|
@ -35,7 +35,7 @@ const security = {
|
|||
|
||||
const { http, notifications } = core;
|
||||
|
||||
const wrapper: WrapperComponent<React.PropsWithChildren<{}>> = ({ children }) => (
|
||||
const wrapper = ({ children }: React.PropsWithChildren<unknown>) => (
|
||||
<UserProfilesKibanaProvider
|
||||
core={core}
|
||||
security={security}
|
||||
|
@ -78,7 +78,7 @@ describe('useUpdateUserProfile() hook', () => {
|
|||
await lastValueFrom(updateDone.pipe(first((v) => v === true)));
|
||||
});
|
||||
|
||||
const { result, waitForNextUpdate } = renderHook(() => useUpdateUserProfile(), { wrapper });
|
||||
const { result } = renderHook(() => useUpdateUserProfile(), { wrapper });
|
||||
const { update } = result.current;
|
||||
|
||||
expect(result.current.isLoading).toBeFalsy();
|
||||
|
@ -90,9 +90,7 @@ describe('useUpdateUserProfile() hook', () => {
|
|||
expect(result.current.isLoading).toBeTruthy();
|
||||
|
||||
updateDone.next(true); // Resolve the http.post promise
|
||||
await waitForNextUpdate();
|
||||
|
||||
expect(result.current.isLoading).toBeFalsy();
|
||||
await waitFor(() => expect(result.current.isLoading).toBeFalsy());
|
||||
});
|
||||
|
||||
test('should show a success notification by default', async () => {
|
||||
|
@ -118,7 +116,9 @@ describe('useUpdateUserProfile() hook', () => {
|
|||
return true;
|
||||
};
|
||||
|
||||
const { result } = renderHook(() => useUpdateUserProfile({ pageReloadChecker }), { wrapper });
|
||||
const { result } = renderHook(() => useUpdateUserProfile({ pageReloadChecker }), {
|
||||
wrapper,
|
||||
});
|
||||
const { update } = result.current;
|
||||
|
||||
await act(async () => {
|
||||
|
@ -146,7 +146,9 @@ describe('useUpdateUserProfile() hook', () => {
|
|||
userProfile$: of(initialValue),
|
||||
};
|
||||
|
||||
const { result } = renderHook(() => useUpdateUserProfile({ pageReloadChecker }), { wrapper });
|
||||
const { result } = renderHook(() => useUpdateUserProfile({ pageReloadChecker }), {
|
||||
wrapper,
|
||||
});
|
||||
const { update } = result.current;
|
||||
|
||||
const nextValue = { userSettings: { darkMode: 'light' as const } };
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { act, renderHook } from '@testing-library/react-hooks';
|
||||
import { act, renderHook } from '@testing-library/react';
|
||||
|
||||
import type { RevertFunction } from './form_changes';
|
||||
import { useFormChanges } from './form_changes';
|
||||
|
|
|
@ -47,11 +47,14 @@ describe('Tags', () => {
|
|||
};
|
||||
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks();
|
||||
useGetTagsMock.mockReturnValue({ data: ['test'] });
|
||||
appMockRender = createAppMockRenderer();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
it('it renders', async () => {
|
||||
appMockRender.render(
|
||||
<MockHookWrapperComponent>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { act, renderHook } from '@testing-library/react-hooks';
|
||||
import { act, renderHook } from '@testing-library/react';
|
||||
import { mount } from 'enzyme';
|
||||
import type { FC, PropsWithChildren } from 'react';
|
||||
import React from 'react';
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { renderHook } from '@testing-library/react-hooks';
|
||||
import { renderHook } from '@testing-library/react';
|
||||
import React from 'react';
|
||||
|
||||
import { coreMock } from '@kbn/core/public/mocks';
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { renderHook } from '@testing-library/react-hooks';
|
||||
import { renderHook } from '@testing-library/react';
|
||||
import React from 'react';
|
||||
|
||||
import { coreMock } from '@kbn/core/public/mocks';
|
||||
|
|
|
@ -114,7 +114,7 @@ describe('EditSpaceContentTab', () => {
|
|||
</TestComponent>
|
||||
);
|
||||
|
||||
await waitFor(() => null);
|
||||
await waitFor(() => new Promise((resolve) => resolve(null)));
|
||||
|
||||
expect(getSpaceContentSpy).toHaveBeenCalledTimes(1);
|
||||
expect(getSpaceContentSpy).toHaveBeenCalledWith(space.id);
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { renderHook } from '@testing-library/react-hooks';
|
||||
import { renderHook } from '@testing-library/react';
|
||||
import type { PropsWithChildren } from 'react';
|
||||
import React from 'react';
|
||||
|
||||
|
@ -88,10 +88,8 @@ describe('EditSpaceProvider', () => {
|
|||
});
|
||||
|
||||
it('throws when the hook is used within a tree that does not have the provider', () => {
|
||||
const { result } = renderHook(useEditSpaceServices);
|
||||
expect(result.error).toBeDefined();
|
||||
expect(result.error?.message).toEqual(
|
||||
expect.stringMatching('EditSpaceService Context is missing.')
|
||||
expect(() => renderHook(useEditSpaceServices)).toThrow(
|
||||
/EditSpaceService Context is missing./
|
||||
);
|
||||
});
|
||||
});
|
||||
|
@ -109,12 +107,7 @@ describe('EditSpaceProvider', () => {
|
|||
});
|
||||
|
||||
it('throws when the hook is used within a tree that does not have the provider', () => {
|
||||
const { result } = renderHook(useEditSpaceStore);
|
||||
|
||||
expect(result.error).toBeDefined();
|
||||
expect(result.error?.message).toEqual(
|
||||
expect.stringMatching('EditSpaceStore Context is missing.')
|
||||
);
|
||||
expect(() => renderHook(useEditSpaceStore)).toThrow(/EditSpaceStore Context is missing./);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
@ -157,7 +157,7 @@ describe('PrivilegesRolesForm', () => {
|
|||
|
||||
renderPrivilegeRolesForm();
|
||||
|
||||
await waitFor(() => null);
|
||||
await waitFor(() => new Promise((resolve) => resolve(null)));
|
||||
|
||||
['all', 'read', 'custom'].forEach((privilege) => {
|
||||
expect(screen.queryByTestId(`${privilege}-privilege-button`)).not.toBeInTheDocument();
|
||||
|
@ -174,9 +174,9 @@ describe('PrivilegesRolesForm', () => {
|
|||
|
||||
renderPrivilegeRolesForm();
|
||||
|
||||
await waitFor(() => null);
|
||||
|
||||
expect(screen.getByTestId('space-assign-role-create-roles-privilege-button')).toBeDisabled();
|
||||
await waitFor(() =>
|
||||
expect(screen.getByTestId('space-assign-role-create-roles-privilege-button')).toBeDisabled()
|
||||
);
|
||||
});
|
||||
|
||||
it('makes a request to refetch available roles if page transitions back from a user interaction page visibility change', () => {
|
||||
|
@ -208,7 +208,7 @@ describe('PrivilegesRolesForm', () => {
|
|||
preSelectedRoles: roles,
|
||||
});
|
||||
|
||||
await waitFor(() => null);
|
||||
await waitFor(() => new Promise((resolve) => resolve(null)));
|
||||
|
||||
expect(screen.getByTestId(`${FEATURE_PRIVILEGES_READ}-privilege-button`)).toHaveAttribute(
|
||||
'aria-pressed',
|
||||
|
@ -234,11 +234,11 @@ describe('PrivilegesRolesForm', () => {
|
|||
],
|
||||
});
|
||||
|
||||
await waitFor(() => null);
|
||||
|
||||
expect(screen.getByTestId(`${FEATURE_PRIVILEGES_ALL}-privilege-button`)).toHaveAttribute(
|
||||
'aria-pressed',
|
||||
String(true)
|
||||
await waitFor(() =>
|
||||
expect(screen.getByTestId(`${FEATURE_PRIVILEGES_ALL}-privilege-button`)).toHaveAttribute(
|
||||
'aria-pressed',
|
||||
String(true)
|
||||
)
|
||||
);
|
||||
});
|
||||
|
||||
|
@ -256,7 +256,7 @@ describe('PrivilegesRolesForm', () => {
|
|||
preSelectedRoles: roles,
|
||||
});
|
||||
|
||||
await waitFor(() => null);
|
||||
await waitFor(() => new Promise((resolve) => resolve(null)));
|
||||
|
||||
expect(screen.getByTestId(`${FEATURE_PRIVILEGES_READ}-privilege-button`)).toHaveAttribute(
|
||||
'aria-pressed',
|
||||
|
@ -290,9 +290,9 @@ describe('PrivilegesRolesForm', () => {
|
|||
preSelectedRoles: roles,
|
||||
});
|
||||
|
||||
await waitFor(() => null);
|
||||
|
||||
expect(screen.getByTestId('privilege-conflict-callout')).toBeInTheDocument();
|
||||
await waitFor(() =>
|
||||
expect(screen.getByTestId('privilege-conflict-callout')).toBeInTheDocument()
|
||||
);
|
||||
});
|
||||
|
||||
it('does not display the permission conflict message when roles with the same privilege levels are selected', async () => {
|
||||
|
@ -312,9 +312,9 @@ describe('PrivilegesRolesForm', () => {
|
|||
preSelectedRoles: roles,
|
||||
});
|
||||
|
||||
await waitFor(() => null);
|
||||
|
||||
expect(screen.queryByTestId('privilege-conflict-callout')).not.toBeInTheDocument();
|
||||
await waitFor(() =>
|
||||
expect(screen.queryByTestId('privilege-conflict-callout')).not.toBeInTheDocument()
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -348,7 +348,7 @@ describe('PrivilegesRolesForm', () => {
|
|||
preSelectedRoles: roles,
|
||||
});
|
||||
|
||||
await waitFor(() => null);
|
||||
await waitFor(() => new Promise((resolve) => resolve(null)));
|
||||
|
||||
await userEvent.click(screen.getByTestId('custom-privilege-button'));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue