From 6d691854f4fae1d9ae794bf38c0f1f033bba7680 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Sat, 23 Nov 2024 05:36:36 +1100
Subject: [PATCH] [8.x] [React18] Migrate test suites to account for testing
library upgrades response-ops (#201141) (#201432)
# Backport
This will backport the following commits from `main` to `8.x`:
- [[React18] Migrate test suites to account for testing library upgrades
response-ops (#201141)](https://github.com/elastic/kibana/pull/201141)
### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)
Co-authored-by: Eyo O. Eyo <7893459+eokoneyo@users.noreply.github.com>
---
.../use_filters_sync_to_local_storage.test.ts | 78 +++---
.../hooks/use_alerts_data_view.test.tsx | 23 +-
.../src/common/hooks/use_create_rule.test.tsx | 3 +-
.../use_fetch_alerts_fields_query.test.tsx | 62 ++---
...se_fetch_alerts_index_names_query.test.tsx | 6 +-
.../use_fetch_flapping_settings.test.tsx | 22 +-
...t_alerts_group_aggregations_query.test.tsx | 3 +-
.../common/hooks/use_health_check.test.tsx | 3 +-
.../hooks/use_load_connector_types.test.tsx | 3 +-
.../common/hooks/use_load_connectors.test.tsx | 3 +-
...oad_rule_type_aad_template_fields.test.tsx | 3 +-
.../common/hooks/use_resolve_rule.test.tsx | 3 +-
.../hooks/use_search_alerts_query.test.tsx | 226 +++++++++---------
.../src/common/hooks/use_update_rule.test.tsx | 3 +-
.../use_virtual_data_view_query.test.tsx | 11 +-
.../hooks/use_load_dependencies.test.tsx | 3 +-
.../rule_form_state_reducer.test.tsx | 2 +-
.../src/hooks/state/reducer.test.ts | 2 +-
.../src/hooks/use_get_group_selector.test.tsx | 2 +-
.../src/hooks/use_grouping.test.tsx | 157 ++++++------
.../use_archive_maintenance_window.test.tsx | 4 +-
.../public/hooks/use_breadcrumbs.test.tsx | 2 +-
.../use_create_maintenance_window.test.tsx | 4 +-
.../use_find_maintenance_windows.test.tsx | 4 +-
...sh_and_archive_maintenance_window.test.tsx | 4 +-
.../use_finish_maintenance_window.test.tsx | 4 +-
.../hooks/use_get_maintenance_window.test.tsx | 4 +-
.../public/hooks/use_license.test.tsx | 2 +-
.../public/hooks/use_navigation.test.tsx | 2 +-
.../use_update_maintenance_window.test.tsx | 4 +-
.../common/apm/use_cases_transactions.test.ts | 14 +-
.../cases/public/common/hooks.test.tsx | 2 +-
.../public/common/lib/kibana/hooks.test.tsx | 7 +-
.../lib/kibana/use_application.test.tsx | 2 +-
.../public/common/navigation/hooks.test.tsx | 3 +-
.../public/common/use_cases_features.test.tsx | 40 ++--
.../common/use_cases_local_storage.test.tsx | 2 +-
.../public/common/use_cases_toast.test.tsx | 3 +-
.../public/common/use_is_user_typing.test.tsx | 2 +-
.../cases/public/common/use_license.test.tsx | 2 +-
.../assignees/use_assignees_action.test.tsx | 8 +-
.../copy_id/use_copy_id_action.test.tsx | 6 +-
.../actions/delete/use_delete_action.test.tsx | 10 +-
.../severity/use_severity_action.test.tsx | 8 +-
.../actions/status/use_status_action.test.tsx | 8 +-
.../actions/tags/use_tags_action.test.tsx | 8 +-
.../actions/use_items_action.test.tsx | 24 +-
.../actions/use_items_state.test.tsx | 2 +-
.../all_cases/all_cases_list.test.tsx | 9 +-
..._cases_add_to_existing_case_modal.test.tsx | 14 +-
.../use_filter_config.test.tsx | 6 +-
.../components/all_cases/use_actions.test.tsx | 3 +-
.../all_cases/use_all_cases_state.test.tsx | 3 +-
.../all_cases/use_bulk_actions.test.tsx | 41 ++--
.../all_cases/use_cases_columns.test.tsx | 2 +-
.../use_cases_columns_configuration.test.tsx | 2 +-
.../use_cases_columns_selection.test.tsx | 2 +-
.../all_cases/use_on_refresh_cases.test.tsx | 2 +-
.../app/use_available_owners.test.ts | 2 +-
.../app/use_readonly_header.test.tsx | 2 +-
.../state/use_is_add_to_case_open.test.tsx | 7 +-
.../use_get_fields_by_issue_type.test.tsx | 8 +-
.../connectors/jira/use_get_issue.test.tsx | 24 +-
.../jira/use_get_issue_types.test.tsx | 8 +-
.../connectors/jira/use_get_issues.test.tsx | 37 +--
.../resilient/use_get_incident_types.test.tsx | 8 +-
.../resilient/use_get_severity.test.tsx | 8 +-
.../servicenow/use_get_choices.test.tsx | 8 +-
.../use_cases_add_to_new_case_flyout.test.tsx | 13 +-
.../use_cancel_creation_action.test.tsx | 2 +-
.../files/use_file_preview.test.tsx | 2 +-
.../files/use_files_table_columns.test.tsx | 2 +-
.../use_markdown_session_storage.test.tsx | 35 +--
.../components/use_breadcrumbs/index.test.tsx | 2 +-
.../use_create_case_modal/index.test.tsx | 29 +--
.../use_push_to_service/index.test.tsx | 135 +++--------
.../use_delete_property_action.test.tsx | 2 +-
.../user_actions/use_last_page.test.tsx | 2 +-
.../use_user_actions_handler.test.tsx | 2 +-
.../use_user_actions_last_page.test.tsx | 8 +-
.../use_user_actions_pagination.test.tsx | 12 +-
.../configure/use_action_types.test.tsx | 8 +-
.../use_get_all_case_configurations.test.ts | 64 ++---
.../use_get_case_configuration.test.tsx | 26 +-
.../use_get_case_configurations_query.test.ts | 3 +-
...t_supported_action_connectors.tsx.test.tsx | 33 ++-
.../use_persist_configuration.test.tsx | 18 +-
.../containers/use_bulk_update_case.test.tsx | 40 ++--
.../use_create_attachments.test.tsx | 25 +-
.../containers/use_delete_cases.test.tsx | 40 ++--
.../containers/use_delete_comment.test.tsx | 84 +++----
.../use_delete_file_attachment.test.tsx | 41 ++--
.../use_find_case_user_actions.test.tsx | 78 +++---
.../use_get_action_license.test.tsx | 13 +-
.../public/containers/use_get_case.test.tsx | 21 +-
.../use_get_case_connectors.test.tsx | 6 +-
.../use_get_case_file_stats.test.tsx | 20 +-
.../containers/use_get_case_files.test.tsx | 20 +-
.../containers/use_get_case_metrics.test.tsx | 19 +-
.../use_get_case_user_actions_stats.test.tsx | 28 +--
.../containers/use_get_case_users.test.tsx | 20 +-
.../public/containers/use_get_cases.test.tsx | 14 +-
.../containers/use_get_cases_metrics.test.tsx | 26 +-
.../containers/use_get_cases_status.test.tsx | 24 +-
.../containers/use_get_categories.test.tsx | 22 +-
.../containers/use_get_feature_ids.test.tsx | 11 +-
.../public/containers/use_get_tags.test.tsx | 20 +-
...e_infinite_find_case_user_actions.test.tsx | 50 ++--
.../containers/use_messages_storage.test.tsx | 53 ++--
.../public/containers/use_post_case.test.tsx | 32 +--
.../use_post_push_to_service.test.tsx | 38 ++-
.../use_replace_custom_field.test.tsx | 84 ++++---
.../containers/use_update_case.test.tsx | 48 ++--
.../containers/use_update_comment.test.tsx | 32 ++-
.../user_profiles/use_assignees.test.ts | 2 +-
.../use_bulk_get_user_profiles.test.ts | 32 ++-
.../use_get_current_user_profile.test.ts | 8 +-
.../use_suggest_user_profiles.test.ts | 28 ++-
.../test_query_row/use_test_query.test.ts | 2 +-
.../email/use_email_config.test.ts | 61 +++--
.../lib/gen_ai/use_get_dashboard.test.ts | 99 ++++----
.../lib/servicenow/use_choices.test.tsx | 52 ++--
.../lib/servicenow/use_get_app_info.test.tsx | 12 +-
.../lib/servicenow/use_get_choices.test.tsx | 62 ++---
.../swimlane/use_get_application.test.tsx | 137 ++++++-----
.../hooks/use_bulk_edit_select.test.tsx | 2 +-
.../hooks/use_create_connector.test.tsx | 14 +-
.../hooks/use_execute_connector.test.tsx | 14 +-
.../use_get_query_delay_setting.test.tsx | 3 +-
.../application/hooks/use_license.test.ts | 2 +-
.../hooks/use_load_alert_summary.test.ts | 29 ++-
.../hooks/use_load_rule_aggregations.test.tsx | 68 +++---
.../application/hooks/use_load_rules.test.tsx | 72 +++---
.../hooks/use_load_tags_query.test.tsx | 76 +++---
.../application/hooks/use_sub_action.test.tsx | 90 ++++---
.../hooks/use_update_rules_settings.test.tsx | 3 +-
.../use_rule_type_ids_by_feature_id.test.ts | 2 +-
.../cases/use_case_view_navigation.test.ts | 14 +-
.../alert_mute/use_get_muted_alerts.test.tsx | 13 +-
.../hooks/alert_mute/use_mute_alert.test.tsx | 3 +-
.../alert_mute/use_unmute_alert.test.tsx | 3 +-
.../hooks/use_bulk_actions.test.tsx | 2 +-
.../hooks/use_bulk_get_cases.test.tsx | 27 +--
.../use_bulk_get_maintenance_windows.test.ts | 19 +-
.../hooks/use_columns/use_columns.test.tsx | 37 ++-
.../alerts_table/hooks/use_pagination.test.ts | 3 +-
.../alerts_table/hooks/use_sorting.test.ts | 3 +-
.../use_rules_list_filter_store.test.tsx | 2 +-
.../rules_list_column_selector.test.tsx | 3 +-
149 files changed, 1531 insertions(+), 1774 deletions(-)
diff --git a/packages/kbn-alerts-ui-shared/src/alert_filter_controls/hooks/use_filters_sync_to_local_storage.test.ts b/packages/kbn-alerts-ui-shared/src/alert_filter_controls/hooks/use_filters_sync_to_local_storage.test.ts
index cb7a9b7f3c5c..dafc4e16c899 100644
--- a/packages/kbn-alerts-ui-shared/src/alert_filter_controls/hooks/use_filters_sync_to_local_storage.test.ts
+++ b/packages/kbn-alerts-ui-shared/src/alert_filter_controls/hooks/use_filters_sync_to_local_storage.test.ts
@@ -8,7 +8,7 @@
*/
import type { ControlGroupRuntimeState } from '@kbn/controls-plugin/public';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, act, renderHook } from '@testing-library/react';
import { useControlGroupSyncToLocalStorage } from './use_control_group_sync_to_local_storage';
import { Storage } from '@kbn/kibana-utils-plugin/public';
@@ -34,77 +34,97 @@ describe('Filters Sync to Local Storage', () => {
writable: true,
});
});
+
afterEach(() => {
mockLocalStorage = {};
});
- it('should not be undefined if localStorage has initial value', () => {
+
+ it('should not be undefined if localStorage has initial value', async () => {
global.localStorage.setItem(TEST_STORAGE_KEY, JSON.stringify(DEFAULT_STORED_VALUE));
- const { result, waitForNextUpdate } = renderHook(() =>
+ const { result } = renderHook(() =>
useControlGroupSyncToLocalStorage({
Storage,
storageKey: TEST_STORAGE_KEY,
shouldSync: true,
})
);
- waitForNextUpdate();
- expect(result.current.controlGroupState).toMatchObject(DEFAULT_STORED_VALUE);
+ await waitFor(() =>
+ expect(result.current.controlGroupState).toMatchObject(DEFAULT_STORED_VALUE)
+ );
});
- it('should be undefined if localstorage as NO initial value', () => {
- const { result, waitForNextUpdate } = renderHook(() =>
+
+ it('should be undefined if localstorage as NO initial value', async () => {
+ const { result } = renderHook(() =>
useControlGroupSyncToLocalStorage({
Storage,
storageKey: TEST_STORAGE_KEY,
shouldSync: true,
})
);
- waitForNextUpdate();
- expect(result.current.controlGroupState).toBeUndefined();
- expect(result.current.setControlGroupState).toBeTruthy();
+ await waitFor(() =>
+ expect(result.current).toEqual(
+ expect.objectContaining({
+ controlGroupState: undefined,
+ setControlGroupState: expect.any(Function),
+ })
+ )
+ );
});
- it('should be update values to local storage when sync is ON', () => {
- const { result, waitFor } = renderHook(() =>
+ it('should be update values to local storage when sync is ON', async () => {
+ const { result } = renderHook(() =>
useControlGroupSyncToLocalStorage({
Storage,
storageKey: TEST_STORAGE_KEY,
shouldSync: true,
})
);
- waitFor(() => {
+ await waitFor(() => {
expect(result.current.controlGroupState).toBeUndefined();
expect(result.current.setControlGroupState).toBeTruthy();
});
- result.current.setControlGroupState(DEFAULT_STORED_VALUE);
- waitFor(() => {
+ act(() => {
+ result.current.setControlGroupState(DEFAULT_STORED_VALUE);
+ });
+ await waitFor(() => {
expect(result.current.controlGroupState).toMatchObject(DEFAULT_STORED_VALUE);
expect(global.localStorage.getItem(TEST_STORAGE_KEY)).toBe(
JSON.stringify(DEFAULT_STORED_VALUE)
);
});
});
- it('should not update values to local storage when sync is OFF', () => {
- const { waitFor, result, rerender } = renderHook(() =>
- useControlGroupSyncToLocalStorage({
- Storage,
- storageKey: TEST_STORAGE_KEY,
- shouldSync: true,
- })
- );
+ it('should not update values to local storage when sync is OFF', async () => {
+ const initialProps = {
+ Storage,
+ storageKey: TEST_STORAGE_KEY,
+ shouldSync: true,
+ };
+
+ const { result, rerender } = renderHook(useControlGroupSyncToLocalStorage, {
+ initialProps,
+ });
// Sync is ON
- waitFor(() => {
+ await waitFor(() => {
expect(result.current.controlGroupState).toBeUndefined();
expect(result.current.setControlGroupState).toBeTruthy();
});
- result.current.setControlGroupState(DEFAULT_STORED_VALUE);
- waitFor(() => {
+ act(() => {
+ result.current.setControlGroupState(DEFAULT_STORED_VALUE);
+ });
+
+ await waitFor(() => {
expect(result.current.controlGroupState).toMatchObject(DEFAULT_STORED_VALUE);
});
// Sync is OFF
- rerender({ storageKey: TEST_STORAGE_KEY, shouldSync: false });
- result.current.setControlGroupState(ANOTHER_SAMPLE_VALUE);
- waitFor(() => {
+ rerender({ ...initialProps, shouldSync: false });
+
+ act(() => {
+ result.current.setControlGroupState(ANOTHER_SAMPLE_VALUE);
+ });
+
+ await waitFor(() => {
expect(result.current.controlGroupState).toMatchObject(ANOTHER_SAMPLE_VALUE);
// old value
expect(global.localStorage.getItem(TEST_STORAGE_KEY)).toBe(
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_alerts_data_view.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_alerts_data_view.test.tsx
index 2f4e8598a4cf..b4945f298a69 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_alerts_data_view.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_alerts_data_view.test.tsx
@@ -10,7 +10,7 @@
import React from 'react';
import { AlertConsumers } from '@kbn/rule-data-utils';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
+import { renderHook, waitFor } from '@testing-library/react';
import { DataView } from '@kbn/data-views-plugin/common';
import { httpServiceMock } from '@kbn/core-http-browser-mocks';
import { notificationServiceMock } from '@kbn/core-notifications-browser-mocks';
@@ -69,7 +69,7 @@ describe('useAlertsDataView', () => {
dataView: undefined,
};
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useAlertsDataView({
...mockServices,
@@ -84,7 +84,7 @@ describe('useAlertsDataView', () => {
});
it('fetches indexes and fields for non-siem feature ids, returning a DataViewBase object', async () => {
- const { result, waitForValueToChange } = renderHook(
+ const { result } = renderHook(
() =>
useAlertsDataView({
...mockServices,
@@ -95,7 +95,7 @@ describe('useAlertsDataView', () => {
}
);
- await waitForValueToChange(() => result.current.isLoading, { timeout: 5000 });
+ await waitFor(() => result.current.isLoading, { timeout: 5000 });
expect(mockFetchAlertsFields).toHaveBeenCalledTimes(1);
expect(mockFetchAlertsIndexNames).toHaveBeenCalledTimes(1);
@@ -103,7 +103,7 @@ describe('useAlertsDataView', () => {
});
it('only fetches index names for the siem feature id, returning a DataView', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useAlertsDataView({ ...mockServices, featureIds: [AlertConsumers.SIEM] }),
{
wrapper,
@@ -117,7 +117,7 @@ describe('useAlertsDataView', () => {
});
it('does not fetch anything if siem and other feature ids are mixed together', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useAlertsDataView({
...mockServices,
@@ -141,7 +141,7 @@ describe('useAlertsDataView', () => {
it('returns an undefined data view if any of the queries fails', async () => {
mockFetchAlertsIndexNames.mockRejectedValue('error');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useAlertsDataView({ ...mockServices, featureIds: observabilityFeatureIds }),
{
wrapper,
@@ -159,12 +159,9 @@ describe('useAlertsDataView', () => {
it('shows an error toast if any of the queries fails', async () => {
mockFetchAlertsIndexNames.mockRejectedValue('error');
- const { waitFor } = renderHook(
- () => useAlertsDataView({ ...mockServices, featureIds: observabilityFeatureIds }),
- {
- wrapper,
- }
- );
+ renderHook(() => useAlertsDataView({ ...mockServices, featureIds: observabilityFeatureIds }), {
+ wrapper,
+ });
await waitFor(() => expect(mockServices.toasts.addDanger).toHaveBeenCalled());
});
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.test.tsx
index b51f878592da..46768f355dbc 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.test.tsx
@@ -9,8 +9,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import type { HttpStart } from '@kbn/core-http-browser';
import { useCreateRule } from './use_create_rule';
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_alerts_fields_query.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_alerts_fields_query.test.tsx
index 3607e75bc868..39818fab28cb 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_alerts_fields_query.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_alerts_fields_query.test.tsx
@@ -10,7 +10,7 @@
import React, { FC } from 'react';
import { AlertConsumers } from '@kbn/rule-data-utils';
import * as ReactQuery from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { testQueryClientConfig } from '../test_utils/test_query_client_config';
import { useFetchAlertsFieldsQuery } from './use_fetch_alerts_fields_query';
import { httpServiceMock } from '@kbn/core-http-browser-mocks';
@@ -88,35 +88,37 @@ describe('useFetchAlertsFieldsQuery', () => {
});
it('should call the api only once', async () => {
- const { result, rerender, waitForValueToChange } = renderHook(
+ const { result, rerender } = renderHook(
() => useFetchAlertsFieldsQuery({ http: mockHttpClient, featureIds: ['apm'] }),
{
wrapper,
}
);
- await waitForValueToChange(() => result.current.data);
-
- expect(mockHttpGet).toHaveBeenCalledTimes(1);
- expect(result.current.data).toEqual({
- browserFields: { fakeCategory: {} },
- fields: [
- {
- name: 'fakeCategory',
- },
- ],
+ await waitFor(() => {
+ expect(mockHttpGet).toHaveBeenCalledTimes(1);
+ expect(result.current.data).toEqual({
+ browserFields: { fakeCategory: {} },
+ fields: [
+ {
+ name: 'fakeCategory',
+ },
+ ],
+ });
});
rerender();
- expect(mockHttpGet).toHaveBeenCalledTimes(1);
- expect(result.current.data).toEqual({
- browserFields: { fakeCategory: {} },
- fields: [
- {
- name: 'fakeCategory',
- },
- ],
+ await waitFor(() => {
+ expect(mockHttpGet).toHaveBeenCalledTimes(1);
+ expect(result.current.data).toEqual({
+ browserFields: { fakeCategory: {} },
+ fields: [
+ {
+ name: 'fakeCategory',
+ },
+ ],
+ });
});
});
@@ -132,8 +134,10 @@ describe('useFetchAlertsFieldsQuery', () => {
}
);
- expect(mockHttpGet).toHaveBeenCalledTimes(0);
- expect(result.current.data).toEqual(emptyData);
+ await waitFor(() => {
+ expect(mockHttpGet).toHaveBeenCalledTimes(0);
+ expect(result.current.data).toEqual(emptyData);
+ });
});
it('should not fetch if all featureId are not valid', async () => {
@@ -148,8 +152,10 @@ describe('useFetchAlertsFieldsQuery', () => {
}
);
- expect(mockHttpGet).toHaveBeenCalledTimes(0);
- expect(result.current.data).toEqual(emptyData);
+ await waitFor(() => {
+ expect(mockHttpGet).toHaveBeenCalledTimes(0);
+ expect(result.current.data).toEqual(emptyData);
+ });
});
it('should filter out the non valid feature id', async () => {
@@ -164,9 +170,11 @@ describe('useFetchAlertsFieldsQuery', () => {
}
);
- expect(mockHttpGet).toHaveBeenCalledTimes(1);
- expect(mockHttpGet).toHaveBeenCalledWith('/internal/rac/alerts/browser_fields', {
- query: { featureIds: ['apm', 'logs'] },
+ await waitFor(() => {
+ expect(mockHttpGet).toHaveBeenCalledTimes(1);
+ expect(mockHttpGet).toHaveBeenCalledWith('/internal/rac/alerts/browser_fields', {
+ query: { featureIds: ['apm', 'logs'] },
+ });
});
});
});
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_alerts_index_names_query.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_alerts_index_names_query.test.tsx
index ab702a2ea09e..c3480a6ce267 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_alerts_index_names_query.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_alerts_index_names_query.test.tsx
@@ -9,7 +9,7 @@
import React, { FunctionComponent } from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { testQueryClientConfig } from '../test_utils/test_query_client_config';
import { useFetchAlertsIndexNamesQuery } from './use_fetch_alerts_index_names_query';
import { fetchAlertsIndexNames } from '../apis/fetch_alerts_index_names';
@@ -56,14 +56,14 @@ describe('useFetchAlertsIndexNamesQuery', () => {
});
it('correctly caches the index names', async () => {
- const { result, rerender, waitForValueToChange } = renderHook(
+ const { result, rerender } = renderHook(
() => useFetchAlertsIndexNamesQuery({ http: mockHttpClient, featureIds: ['apm'] }),
{
wrapper,
}
);
- await waitForValueToChange(() => result.current.data);
+ await waitFor(() => result.current.data);
expect(mockFetchAlertsIndexNames).toHaveBeenCalledTimes(1);
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_flapping_settings.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_flapping_settings.test.tsx
index 10e1869b9e64..6aad133fee5e 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_flapping_settings.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_fetch_flapping_settings.test.tsx
@@ -9,7 +9,7 @@
import React, { FunctionComponent } from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook, waitFor } from '@testing-library/react';
import { testQueryClientConfig } from '../test_utils/test_query_client_config';
import { useFetchFlappingSettings } from './use_fetch_flapping_settings';
import { httpServiceMock } from '@kbn/core-http-browser-mocks';
@@ -43,12 +43,9 @@ describe('useFetchFlappingSettings', () => {
});
test('should call fetchFlappingSettings with the correct parameters', async () => {
- const { result, waitFor } = renderHook(
- () => useFetchFlappingSettings({ http, enabled: true }),
- {
- wrapper,
- }
- );
+ const { result } = renderHook(() => useFetchFlappingSettings({ http, enabled: true }), {
+ wrapper,
+ });
await waitFor(() => {
return expect(result.current.isInitialLoading).toEqual(false);
@@ -66,12 +63,9 @@ describe('useFetchFlappingSettings', () => {
});
test('should not call fetchFlappingSettings if enabled is false', async () => {
- const { result, waitFor } = renderHook(
- () => useFetchFlappingSettings({ http, enabled: false }),
- {
- wrapper,
- }
- );
+ const { result } = renderHook(() => useFetchFlappingSettings({ http, enabled: false }), {
+ wrapper,
+ });
await waitFor(() => {
return expect(result.current.isInitialLoading).toEqual(false);
@@ -82,7 +76,7 @@ describe('useFetchFlappingSettings', () => {
test('should call onSuccess when the fetching was successful', async () => {
const onSuccessMock = jest.fn();
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useFetchFlappingSettings({ http, enabled: true, onSuccess: onSuccessMock }),
{
wrapper,
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.test.tsx
index 14aca036ed87..50dcf3d7e290 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.test.tsx
@@ -9,13 +9,12 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
import type { HttpStart } from '@kbn/core-http-browser';
import { ToastsStart } from '@kbn/core-notifications-browser';
import { AlertConsumers } from '@kbn/rule-data-utils';
import { useGetAlertsGroupAggregationsQuery } from './use_get_alerts_group_aggregations_query';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { BASE_RAC_ALERTS_API_PATH } from '../constants';
const queryClient = new QueryClient({
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.test.tsx
index da4d5bc3a878..ecf4ddc685e2 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.test.tsx
@@ -9,8 +9,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import type { HttpStart } from '@kbn/core-http-browser';
import { useHealthCheck } from './use_health_check';
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connector_types.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connector_types.test.tsx
index 63e494ab8708..cc21ecef9745 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connector_types.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connector_types.test.tsx
@@ -9,8 +9,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { httpServiceMock } from '@kbn/core/public/mocks';
import { useLoadConnectorTypes } from './use_load_connector_types';
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connectors.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connectors.test.tsx
index 6ab5c58cb151..7d81a67ebce9 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connectors.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_connectors.test.tsx
@@ -9,8 +9,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { httpServiceMock } from '@kbn/core/public/mocks';
import { useLoadConnectors } from './use_load_connectors';
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_type_aad_template_fields.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_type_aad_template_fields.test.tsx
index 7d3c0815ffae..0af35ccddba4 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_type_aad_template_fields.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_type_aad_template_fields.test.tsx
@@ -9,8 +9,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { httpServiceMock } from '@kbn/core/public/mocks';
import { useLoadRuleTypeAadTemplateField } from './use_load_rule_type_aad_template_fields';
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.test.tsx
index 4f74179fa8d5..69c3234d812f 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.test.tsx
@@ -9,8 +9,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import type { HttpStart } from '@kbn/core-http-browser';
import { useResolveRule } from './use_resolve_rule';
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_search_alerts_query.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_search_alerts_query.test.tsx
index 664a525796d4..4d1d8c93407e 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_search_alerts_query.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_search_alerts_query.test.tsx
@@ -12,7 +12,7 @@ import { of } from 'rxjs';
import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
import type { IKibanaSearchResponse } from '@kbn/search-types';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import type { UseSearchAlertsQueryParams } from './use_search_alerts_query';
import { AlertsQueryContext } from '../contexts/alerts_query_context';
import { useSearchAlertsQuery } from './use_search_alerts_query';
@@ -126,126 +126,128 @@ describe('useSearchAlertsQuery', () => {
});
it('returns the response correctly', async () => {
- const { result, waitForValueToChange } = renderHook(() => useSearchAlertsQuery(params), {
+ const { result } = renderHook(() => useSearchAlertsQuery(params), {
wrapper,
});
- await waitForValueToChange(() => result.current.data);
- expect(result.current.data).toEqual(
- expect.objectContaining({
- ...expectedResponse,
- alerts: [
- {
- _index: '.internal.alerts-security.alerts-default-000001',
- _id: '38dd308706a127696cc63b8f142e8e4d66f8f79bc7d491dd79a42ea4ead62dd1',
- '@timestamp': ['2022-03-22T16:48:07.518Z'],
- 'host.name': ['Host-4dbzugdlqd'],
- 'kibana.alert.reason': [
- 'registry event with process iexlorer.exe, by 5qcxz8o4j7 on Host-4dbzugdlqd created low alert test.',
- ],
- 'kibana.alert.risk_score': [21],
- 'kibana.alert.rule.name': ['test'],
- 'kibana.alert.severity': ['low'],
- 'process.name': ['iexlorer.exe'],
- 'user.name': ['5qcxz8o4j7'],
- },
- {
- _index: '.internal.alerts-security.alerts-default-000001',
- _id: '8361363c0db6f30ca2dfb4aeb4835e7d6ec57bc195b96d9ee5a4ead1bb9f8b86',
- '@timestamp': ['2022-03-22T16:17:50.769Z'],
- 'host.name': ['Host-4dbzugdlqd'],
- 'kibana.alert.reason': [
- 'network event with process iexlorer.exe, by hdgsmwj08h on Host-4dbzugdlqd created low alert test.',
- ],
- 'kibana.alert.risk_score': [21],
- 'kibana.alert.rule.name': ['test'],
- 'kibana.alert.severity': ['low'],
- 'process.name': ['iexlorer.exe'],
- 'user.name': ['hdgsmwj08h'],
- },
- ],
- total: 2,
- ecsAlertsData: [
- {
- kibana: {
- alert: {
- severity: ['low'],
- risk_score: [21],
- rule: { name: ['test'] },
- reason: [
+ await waitFor(() => {
+ expect(result.current.data).toBeDefined();
+ expect(result.current.data).toEqual(
+ expect.objectContaining({
+ ...expectedResponse,
+ alerts: [
+ {
+ _index: '.internal.alerts-security.alerts-default-000001',
+ _id: '38dd308706a127696cc63b8f142e8e4d66f8f79bc7d491dd79a42ea4ead62dd1',
+ '@timestamp': ['2022-03-22T16:48:07.518Z'],
+ 'host.name': ['Host-4dbzugdlqd'],
+ 'kibana.alert.reason': [
+ 'registry event with process iexlorer.exe, by 5qcxz8o4j7 on Host-4dbzugdlqd created low alert test.',
+ ],
+ 'kibana.alert.risk_score': [21],
+ 'kibana.alert.rule.name': ['test'],
+ 'kibana.alert.severity': ['low'],
+ 'process.name': ['iexlorer.exe'],
+ 'user.name': ['5qcxz8o4j7'],
+ },
+ {
+ _index: '.internal.alerts-security.alerts-default-000001',
+ _id: '8361363c0db6f30ca2dfb4aeb4835e7d6ec57bc195b96d9ee5a4ead1bb9f8b86',
+ '@timestamp': ['2022-03-22T16:17:50.769Z'],
+ 'host.name': ['Host-4dbzugdlqd'],
+ 'kibana.alert.reason': [
+ 'network event with process iexlorer.exe, by hdgsmwj08h on Host-4dbzugdlqd created low alert test.',
+ ],
+ 'kibana.alert.risk_score': [21],
+ 'kibana.alert.rule.name': ['test'],
+ 'kibana.alert.severity': ['low'],
+ 'process.name': ['iexlorer.exe'],
+ 'user.name': ['hdgsmwj08h'],
+ },
+ ],
+ total: 2,
+ ecsAlertsData: [
+ {
+ kibana: {
+ alert: {
+ severity: ['low'],
+ risk_score: [21],
+ rule: { name: ['test'] },
+ reason: [
+ 'registry event with process iexlorer.exe, by 5qcxz8o4j7 on Host-4dbzugdlqd created low alert test.',
+ ],
+ },
+ },
+ process: { name: ['iexlorer.exe'] },
+ '@timestamp': ['2022-03-22T16:48:07.518Z'],
+ user: { name: ['5qcxz8o4j7'] },
+ host: { name: ['Host-4dbzugdlqd'] },
+ _id: '38dd308706a127696cc63b8f142e8e4d66f8f79bc7d491dd79a42ea4ead62dd1',
+ _index: '.internal.alerts-security.alerts-default-000001',
+ },
+ {
+ kibana: {
+ alert: {
+ severity: ['low'],
+ risk_score: [21],
+ rule: { name: ['test'] },
+ reason: [
+ 'network event with process iexlorer.exe, by hdgsmwj08h on Host-4dbzugdlqd created low alert test.',
+ ],
+ },
+ },
+ process: { name: ['iexlorer.exe'] },
+ '@timestamp': ['2022-03-22T16:17:50.769Z'],
+ user: { name: ['hdgsmwj08h'] },
+ host: { name: ['Host-4dbzugdlqd'] },
+ _id: '8361363c0db6f30ca2dfb4aeb4835e7d6ec57bc195b96d9ee5a4ead1bb9f8b86',
+ _index: '.internal.alerts-security.alerts-default-000001',
+ },
+ ],
+ oldAlertsData: [
+ [
+ { field: 'kibana.alert.severity', value: ['low'] },
+ { field: 'process.name', value: ['iexlorer.exe'] },
+ { field: '@timestamp', value: ['2022-03-22T16:48:07.518Z'] },
+ { field: 'kibana.alert.risk_score', value: [21] },
+ { field: 'kibana.alert.rule.name', value: ['test'] },
+ { field: 'user.name', value: ['5qcxz8o4j7'] },
+ {
+ field: 'kibana.alert.reason',
+ value: [
'registry event with process iexlorer.exe, by 5qcxz8o4j7 on Host-4dbzugdlqd created low alert test.',
],
},
- },
- process: { name: ['iexlorer.exe'] },
- '@timestamp': ['2022-03-22T16:48:07.518Z'],
- user: { name: ['5qcxz8o4j7'] },
- host: { name: ['Host-4dbzugdlqd'] },
- _id: '38dd308706a127696cc63b8f142e8e4d66f8f79bc7d491dd79a42ea4ead62dd1',
- _index: '.internal.alerts-security.alerts-default-000001',
- },
- {
- kibana: {
- alert: {
- severity: ['low'],
- risk_score: [21],
- rule: { name: ['test'] },
- reason: [
+ { field: 'host.name', value: ['Host-4dbzugdlqd'] },
+ {
+ field: '_id',
+ value: '38dd308706a127696cc63b8f142e8e4d66f8f79bc7d491dd79a42ea4ead62dd1',
+ },
+ { field: '_index', value: '.internal.alerts-security.alerts-default-000001' },
+ ],
+ [
+ { field: 'kibana.alert.severity', value: ['low'] },
+ { field: 'process.name', value: ['iexlorer.exe'] },
+ { field: '@timestamp', value: ['2022-03-22T16:17:50.769Z'] },
+ { field: 'kibana.alert.risk_score', value: [21] },
+ { field: 'kibana.alert.rule.name', value: ['test'] },
+ { field: 'user.name', value: ['hdgsmwj08h'] },
+ {
+ field: 'kibana.alert.reason',
+ value: [
'network event with process iexlorer.exe, by hdgsmwj08h on Host-4dbzugdlqd created low alert test.',
],
},
- },
- process: { name: ['iexlorer.exe'] },
- '@timestamp': ['2022-03-22T16:17:50.769Z'],
- user: { name: ['hdgsmwj08h'] },
- host: { name: ['Host-4dbzugdlqd'] },
- _id: '8361363c0db6f30ca2dfb4aeb4835e7d6ec57bc195b96d9ee5a4ead1bb9f8b86',
- _index: '.internal.alerts-security.alerts-default-000001',
- },
- ],
- oldAlertsData: [
- [
- { field: 'kibana.alert.severity', value: ['low'] },
- { field: 'process.name', value: ['iexlorer.exe'] },
- { field: '@timestamp', value: ['2022-03-22T16:48:07.518Z'] },
- { field: 'kibana.alert.risk_score', value: [21] },
- { field: 'kibana.alert.rule.name', value: ['test'] },
- { field: 'user.name', value: ['5qcxz8o4j7'] },
- {
- field: 'kibana.alert.reason',
- value: [
- 'registry event with process iexlorer.exe, by 5qcxz8o4j7 on Host-4dbzugdlqd created low alert test.',
- ],
- },
- { field: 'host.name', value: ['Host-4dbzugdlqd'] },
- {
- field: '_id',
- value: '38dd308706a127696cc63b8f142e8e4d66f8f79bc7d491dd79a42ea4ead62dd1',
- },
- { field: '_index', value: '.internal.alerts-security.alerts-default-000001' },
+ { field: 'host.name', value: ['Host-4dbzugdlqd'] },
+ {
+ field: '_id',
+ value: '8361363c0db6f30ca2dfb4aeb4835e7d6ec57bc195b96d9ee5a4ead1bb9f8b86',
+ },
+ { field: '_index', value: '.internal.alerts-security.alerts-default-000001' },
+ ],
],
- [
- { field: 'kibana.alert.severity', value: ['low'] },
- { field: 'process.name', value: ['iexlorer.exe'] },
- { field: '@timestamp', value: ['2022-03-22T16:17:50.769Z'] },
- { field: 'kibana.alert.risk_score', value: [21] },
- { field: 'kibana.alert.rule.name', value: ['test'] },
- { field: 'user.name', value: ['hdgsmwj08h'] },
- {
- field: 'kibana.alert.reason',
- value: [
- 'network event with process iexlorer.exe, by hdgsmwj08h on Host-4dbzugdlqd created low alert test.',
- ],
- },
- { field: 'host.name', value: ['Host-4dbzugdlqd'] },
- {
- field: '_id',
- value: '8361363c0db6f30ca2dfb4aeb4835e7d6ec57bc195b96d9ee5a4ead1bb9f8b86',
- },
- { field: '_index', value: '.internal.alerts-security.alerts-default-000001' },
- ],
- ],
- })
- );
+ })
+ );
+ });
});
it('returns empty placeholder data', () => {
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.test.tsx
index ec3579f20db5..654166f4bbac 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.test.tsx
@@ -9,8 +9,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import type { HttpStart } from '@kbn/core-http-browser';
import { useUpdateRule } from './use_update_rule';
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_virtual_data_view_query.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_virtual_data_view_query.test.tsx
index 834409a87f52..09be28ec1503 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/use_virtual_data_view_query.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_virtual_data_view_query.test.tsx
@@ -9,7 +9,7 @@
import React, { FunctionComponent } from 'react';
import * as ReactQuery from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { testQueryClientConfig } from '../test_utils/test_query_client_config';
import { queryKeyPrefix, useVirtualDataViewQuery } from './use_virtual_data_view_query';
import { DataView } from '@kbn/data-views-plugin/common';
@@ -38,10 +38,11 @@ describe('useVirtualDataViewQuery', () => {
it('does not create a data view if indexNames is empty or nullish', () => {
const { rerender } = renderHook(
- ({ indexNames }: React.PropsWithChildren<{ indexNames: string[] }>) =>
+ ({ indexNames }: { indexNames?: string[] }) =>
useVirtualDataViewQuery({ dataViewsService: mockDataViewsService, indexNames }),
{
wrapper,
+ initialProps: {},
}
);
@@ -89,7 +90,7 @@ describe('useVirtualDataViewQuery', () => {
});
it('removes the data view from the instance cache on unmount', async () => {
- const { result, waitForValueToChange, unmount } = renderHook(
+ const { result, unmount } = renderHook(
() =>
useVirtualDataViewQuery({
dataViewsService: mockDataViewsService,
@@ -100,10 +101,10 @@ describe('useVirtualDataViewQuery', () => {
}
);
- await waitForValueToChange(() => result.current.data);
+ await waitFor(() => expect(result.current.data).toBeDefined());
unmount();
- expect(mockDataViewsService.clearInstanceCache).toHaveBeenCalled();
+ await waitFor(() => expect(mockDataViewsService.clearInstanceCache).toHaveBeenCalled());
});
});
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.test.tsx
index f0a14ac82e4a..3dd6a6a3cee1 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/hooks/use_load_dependencies.test.tsx
@@ -9,8 +9,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import type { HttpStart } from '@kbn/core-http-browser';
import type { ToastsStart } from '@kbn/core-notifications-browser';
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.test.tsx
index d8e6380462f9..f560c3ace22a 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.test.tsx
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/rule_form_state/rule_form_state_reducer.test.tsx
@@ -8,7 +8,7 @@
*/
import React, { useReducer } from 'react';
-import { act, renderHook } from '@testing-library/react-hooks/dom';
+import { renderHook, act } from '@testing-library/react';
import { ruleFormStateReducer } from './rule_form_state_reducer';
import { RuleFormState } from '../types';
import { getAction } from '../../common/test_utils/actions_test_utils';
diff --git a/packages/kbn-grouping/src/hooks/state/reducer.test.ts b/packages/kbn-grouping/src/hooks/state/reducer.test.ts
index c056565b7bf1..7d00d64eadd2 100644
--- a/packages/kbn-grouping/src/hooks/state/reducer.test.ts
+++ b/packages/kbn-grouping/src/hooks/state/reducer.test.ts
@@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import { useReducer } from 'react';
import { groupActions, groupsReducerWithStorage, initialState } from '.';
import { defaultGroup, LOCAL_STORAGE_GROUPING_KEY } from '../..';
diff --git a/packages/kbn-grouping/src/hooks/use_get_group_selector.test.tsx b/packages/kbn-grouping/src/hooks/use_get_group_selector.test.tsx
index 312ccde33e32..d29e1b63f1ea 100644
--- a/packages/kbn-grouping/src/hooks/use_get_group_selector.test.tsx
+++ b/packages/kbn-grouping/src/hooks/use_get_group_selector.test.tsx
@@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import { useGetGroupSelector, useGetGroupSelectorStateless } from './use_get_group_selector';
import { initialState } from './state';
diff --git a/packages/kbn-grouping/src/hooks/use_grouping.test.tsx b/packages/kbn-grouping/src/hooks/use_grouping.test.tsx
index 22957548de31..834db5acaa39 100644
--- a/packages/kbn-grouping/src/hooks/use_grouping.test.tsx
+++ b/packages/kbn-grouping/src/hooks/use_grouping.test.tsx
@@ -8,9 +8,8 @@
*/
import React from 'react';
-import { act, renderHook } from '@testing-library/react-hooks';
import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { render } from '@testing-library/react';
+import { render, waitFor, renderHook } from '@testing-library/react';
import { useGrouping } from './use_grouping';
@@ -46,92 +45,86 @@ const groupingArgs = {
describe('useGrouping', () => {
it('Renders child component without grouping table wrapper when no group is selected', async () => {
- await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() => useGrouping(defaultArgs));
- await waitForNextUpdate();
- await waitForNextUpdate();
- const { getByTestId, queryByTestId } = render(
-
- {result.current.getGrouping({
- ...groupingArgs,
- data: {
- groupsCount: {
- value: 9,
- },
- groupByFields: {
- buckets: [
- {
- key: ['critical hosts', 'description'],
- key_as_string: 'critical hosts|description',
- doc_count: 3,
- unitsCount: {
- value: 3,
- },
- },
- ],
- },
- unitsCount: {
- value: 18,
- },
+ const { result } = renderHook(() => useGrouping(defaultArgs));
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ const { getByTestId, queryByTestId } = render(
+
+ {result.current.getGrouping({
+ ...groupingArgs,
+ data: {
+ groupsCount: {
+ value: 9,
},
- renderChildComponent: () => {'hello'}
,
- selectedGroup: 'none',
- })}
-
- );
+ groupByFields: {
+ buckets: [
+ {
+ key: ['critical hosts', 'description'],
+ key_as_string: 'critical hosts|description',
+ doc_count: 3,
+ unitsCount: {
+ value: 3,
+ },
+ },
+ ],
+ },
+ unitsCount: {
+ value: 18,
+ },
+ },
+ renderChildComponent: () => {'hello'}
,
+ selectedGroup: 'none',
+ })}
+
+ );
- expect(getByTestId('innerTable')).toBeInTheDocument();
- expect(queryByTestId('grouping-table')).not.toBeInTheDocument();
- });
+ expect(getByTestId('innerTable')).toBeInTheDocument();
+ expect(queryByTestId('grouping-table')).not.toBeInTheDocument();
});
it('Renders child component with grouping table wrapper when group is selected', async () => {
- await act(async () => {
- const getItem = jest.spyOn(window.localStorage.__proto__, 'getItem');
- getItem.mockReturnValue(
- JSON.stringify({
- 'test-table': {
- itemsPerPageOptions: [10, 25, 50, 100],
- itemsPerPage: 25,
- activeGroup: 'kibana.alert.rule.name',
- options: defaultGroupingOptions,
- },
- })
- );
+ const getItem = jest.spyOn(window.localStorage.__proto__, 'getItem');
+ getItem.mockReturnValue(
+ JSON.stringify({
+ 'test-table': {
+ itemsPerPageOptions: [10, 25, 50, 100],
+ itemsPerPage: 25,
+ activeGroup: 'kibana.alert.rule.name',
+ options: defaultGroupingOptions,
+ },
+ })
+ );
- const { result, waitForNextUpdate } = renderHook(() => useGrouping(defaultArgs));
- await waitForNextUpdate();
- await waitForNextUpdate();
- const { getByTestId } = render(
-
- {result.current.getGrouping({
- ...groupingArgs,
- data: {
- groupsCount: {
- value: 9,
- },
- groupByFields: {
- buckets: [
- {
- key: ['critical hosts', 'description'],
- key_as_string: 'critical hosts|description',
- doc_count: 3,
- unitsCount: {
- value: 3,
- },
- },
- ],
- },
- unitsCount: {
- value: 18,
- },
+ const { result } = renderHook(() => useGrouping(defaultArgs));
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ const { getByTestId } = render(
+
+ {result.current.getGrouping({
+ ...groupingArgs,
+ data: {
+ groupsCount: {
+ value: 9,
},
- renderChildComponent: jest.fn(),
- selectedGroup: 'test',
- })}
-
- );
+ groupByFields: {
+ buckets: [
+ {
+ key: ['critical hosts', 'description'],
+ key_as_string: 'critical hosts|description',
+ doc_count: 3,
+ unitsCount: {
+ value: 3,
+ },
+ },
+ ],
+ },
+ unitsCount: {
+ value: 18,
+ },
+ },
+ renderChildComponent: jest.fn(),
+ selectedGroup: 'test',
+ })}
+
+ );
- expect(getByTestId('grouping-table')).toBeInTheDocument();
- });
+ expect(getByTestId('grouping-table')).toBeInTheDocument();
});
});
diff --git a/x-pack/plugins/alerting/public/hooks/use_archive_maintenance_window.test.tsx b/x-pack/plugins/alerting/public/hooks/use_archive_maintenance_window.test.tsx
index e6f58df8d3a7..367da7e65811 100644
--- a/x-pack/plugins/alerting/public/hooks/use_archive_maintenance_window.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_archive_maintenance_window.test.tsx
@@ -4,8 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+
+import { waitFor, renderHook, act } from '@testing-library/react';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
import { useArchiveMaintenanceWindow } from './use_archive_maintenance_window';
diff --git a/x-pack/plugins/alerting/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/alerting/public/hooks/use_breadcrumbs.test.tsx
index 9eb5970e86a9..f06fd2be6799 100644
--- a/x-pack/plugins/alerting/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_breadcrumbs.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { useBreadcrumbs } from './use_breadcrumbs';
import { MAINTENANCE_WINDOW_DEEP_LINK_IDS } from '../../common';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
diff --git a/x-pack/plugins/alerting/public/hooks/use_create_maintenance_window.test.tsx b/x-pack/plugins/alerting/public/hooks/use_create_maintenance_window.test.tsx
index 26d70f2d4e9a..12564df1bf1b 100644
--- a/x-pack/plugins/alerting/public/hooks/use_create_maintenance_window.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_create_maintenance_window.test.tsx
@@ -4,8 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+
+import { waitFor, renderHook, act } from '@testing-library/react';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
import { useCreateMaintenanceWindow } from './use_create_maintenance_window';
diff --git a/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.test.tsx b/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.test.tsx
index d21b145aea93..b543d7940cd9 100644
--- a/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.test.tsx
@@ -4,8 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+
+import { waitFor, renderHook } from '@testing-library/react';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
import { useFindMaintenanceWindows } from './use_find_maintenance_windows';
diff --git a/x-pack/plugins/alerting/public/hooks/use_finish_and_archive_maintenance_window.test.tsx b/x-pack/plugins/alerting/public/hooks/use_finish_and_archive_maintenance_window.test.tsx
index 8b55812bd030..7e453d5d78d5 100644
--- a/x-pack/plugins/alerting/public/hooks/use_finish_and_archive_maintenance_window.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_finish_and_archive_maintenance_window.test.tsx
@@ -4,8 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+
+import { waitFor, renderHook, act } from '@testing-library/react';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
import { useFinishAndArchiveMaintenanceWindow } from './use_finish_and_archive_maintenance_window';
diff --git a/x-pack/plugins/alerting/public/hooks/use_finish_maintenance_window.test.tsx b/x-pack/plugins/alerting/public/hooks/use_finish_maintenance_window.test.tsx
index 6041796fcc00..fc972eddeafe 100644
--- a/x-pack/plugins/alerting/public/hooks/use_finish_maintenance_window.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_finish_maintenance_window.test.tsx
@@ -4,8 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+
+import { waitFor, renderHook, act } from '@testing-library/react';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
import { useFinishMaintenanceWindow } from './use_finish_maintenance_window';
diff --git a/x-pack/plugins/alerting/public/hooks/use_get_maintenance_window.test.tsx b/x-pack/plugins/alerting/public/hooks/use_get_maintenance_window.test.tsx
index 3003f1003ce1..d58aebe0a157 100644
--- a/x-pack/plugins/alerting/public/hooks/use_get_maintenance_window.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_get_maintenance_window.test.tsx
@@ -4,8 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+
+import { waitFor, renderHook } from '@testing-library/react';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
import { useGetMaintenanceWindow } from './use_get_maintenance_window';
diff --git a/x-pack/plugins/alerting/public/hooks/use_license.test.tsx b/x-pack/plugins/alerting/public/hooks/use_license.test.tsx
index 0611a6ba86ae..f9d439607257 100644
--- a/x-pack/plugins/alerting/public/hooks/use_license.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_license.test.tsx
@@ -6,7 +6,7 @@
*/
import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { useLicense } from './use_license';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
diff --git a/x-pack/plugins/alerting/public/hooks/use_navigation.test.tsx b/x-pack/plugins/alerting/public/hooks/use_navigation.test.tsx
index 2ea981db2a4d..1b7c48ee684e 100644
--- a/x-pack/plugins/alerting/public/hooks/use_navigation.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_navigation.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import {
useCreateMaintenanceWindowNavigation,
diff --git a/x-pack/plugins/alerting/public/hooks/use_update_maintenance_window.test.tsx b/x-pack/plugins/alerting/public/hooks/use_update_maintenance_window.test.tsx
index 6ba19c27c362..a1da94422c89 100644
--- a/x-pack/plugins/alerting/public/hooks/use_update_maintenance_window.test.tsx
+++ b/x-pack/plugins/alerting/public/hooks/use_update_maintenance_window.test.tsx
@@ -4,8 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+
+import { waitFor, renderHook, act } from '@testing-library/react';
import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
import { useUpdateMaintenanceWindow } from './use_update_maintenance_window';
diff --git a/x-pack/plugins/cases/public/common/apm/use_cases_transactions.test.ts b/x-pack/plugins/cases/public/common/apm/use_cases_transactions.test.ts
index c1cf6b305d48..9a5709c911fb 100644
--- a/x-pack/plugins/cases/public/common/apm/use_cases_transactions.test.ts
+++ b/x-pack/plugins/cases/public/common/apm/use_cases_transactions.test.ts
@@ -5,12 +5,8 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import type { CaseAttachmentsWithoutOwner } from '../../types';
-import type {
- StartAddAttachmentToExistingCaseTransaction,
- StartCreateCaseWithAttachmentsTransaction,
-} from './use_cases_transactions';
import {
useAddAttachmentToExistingCaseTransaction,
useCreateCaseWithAttachmentsTransaction,
@@ -37,14 +33,10 @@ const bulkAttachments = [
] as CaseAttachmentsWithoutOwner;
const renderUseCreateCaseWithAttachmentsTransaction = () =>
- renderHook(
- useCreateCaseWithAttachmentsTransaction
- );
+ renderHook(useCreateCaseWithAttachmentsTransaction);
const renderUseAddAttachmentToExistingCaseTransaction = () =>
- renderHook(
- useAddAttachmentToExistingCaseTransaction
- );
+ renderHook(useAddAttachmentToExistingCaseTransaction);
describe('cases transactions', () => {
beforeEach(() => {
diff --git a/x-pack/plugins/cases/public/common/hooks.test.tsx b/x-pack/plugins/cases/public/common/hooks.test.tsx
index d2cea878504b..85dcfe11aaf5 100644
--- a/x-pack/plugins/cases/public/common/hooks.test.tsx
+++ b/x-pack/plugins/cases/public/common/hooks.test.tsx
@@ -6,7 +6,7 @@
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { TestProviders } from './mock';
import { useIsMainApplication } from './hooks';
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/hooks.test.tsx b/x-pack/plugins/cases/public/common/lib/kibana/hooks.test.tsx
index 60b798d37822..73d1822c6249 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/hooks.test.tsx
+++ b/x-pack/plugins/cases/public/common/lib/kibana/hooks.test.tsx
@@ -6,7 +6,7 @@
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { useApplicationCapabilities } from './hooks';
import { allCasesPermissions, TestProviders } from '../../mock';
@@ -14,10 +14,7 @@ import { allCasesPermissions, TestProviders } from '../../mock';
describe('hooks', () => {
describe('useApplicationCapabilities', () => {
it('should return the correct capabilities', async () => {
- const { result } = renderHook<
- React.PropsWithChildren<{}>,
- ReturnType
- >(() => useApplicationCapabilities(), {
+ const { result } = renderHook(() => useApplicationCapabilities(), {
wrapper: ({ children }) => {children},
});
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/use_application.test.tsx b/x-pack/plugins/cases/public/common/lib/kibana/use_application.test.tsx
index 81152d3d3c5a..69c5fc4f8db2 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/use_application.test.tsx
+++ b/x-pack/plugins/cases/public/common/lib/kibana/use_application.test.tsx
@@ -7,7 +7,7 @@
import type { PublicAppInfo } from '@kbn/core-application-browser';
import { AppStatus } from '@kbn/core-application-browser';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { BehaviorSubject, Subject } from 'rxjs';
import type { AppMockRenderer } from '../../mock';
import { createAppMockRenderer } from '../../mock';
diff --git a/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx b/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
index 2170ed2d0e58..867e4d682695 100644
--- a/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
+++ b/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
@@ -6,7 +6,8 @@
*/
import React from 'react';
-import { act, renderHook } from '@testing-library/react-hooks';
+
+import { renderHook, act } from '@testing-library/react';
import { APP_ID } from '../../../common/constants';
import { useNavigation } from '../lib/kibana';
diff --git a/x-pack/plugins/cases/public/common/use_cases_features.test.tsx b/x-pack/plugins/cases/public/common/use_cases_features.test.tsx
index eeabf3fb0cab..c4c54af0b1c4 100644
--- a/x-pack/plugins/cases/public/common/use_cases_features.test.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_features.test.tsx
@@ -6,10 +6,9 @@
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
import type { CasesContextFeatures } from '../../common/ui';
-import type { UseCasesFeatures } from './use_cases_features';
import { useCasesFeatures } from './use_cases_features';
import { TestProviders } from './mock/test_providers';
import type { LicenseType } from '@kbn/licensing-plugin/common/types';
@@ -37,14 +36,9 @@ describe('useCasesFeatures', () => {
it.each(tests)(
'returns isAlertsEnabled=%s and isSyncAlertsEnabled=%s if feature.alerts=%s',
async (isAlertsEnabled, isSyncAlertsEnabled, alerts) => {
- const { result } = renderHook, UseCasesFeatures>(
- () => useCasesFeatures(),
- {
- wrapper: ({ children }) => (
- {children}
- ),
- }
- );
+ const { result } = renderHook(() => useCasesFeatures(), {
+ wrapper: ({ children }) => {children},
+ });
expect(result.current).toEqual({
isAlertsEnabled,
@@ -57,16 +51,13 @@ describe('useCasesFeatures', () => {
);
it('returns the metrics correctly', async () => {
- const { result } = renderHook, UseCasesFeatures>(
- () => useCasesFeatures(),
- {
- wrapper: ({ children }) => (
-
- {children}
-
- ),
- }
- );
+ const { result } = renderHook(() => useCasesFeatures(), {
+ wrapper: ({ children }) => (
+
+ {children}
+
+ ),
+ });
expect(result.current).toEqual({
isAlertsEnabled: true,
@@ -91,12 +82,9 @@ describe('useCasesFeatures', () => {
license: { type },
});
- const { result } = renderHook, UseCasesFeatures>(
- () => useCasesFeatures(),
- {
- wrapper: ({ children }) => {children},
- }
- );
+ const { result } = renderHook(() => useCasesFeatures(), {
+ wrapper: ({ children }) => {children},
+ });
expect(result.current).toEqual({
isAlertsEnabled: true,
diff --git a/x-pack/plugins/cases/public/common/use_cases_local_storage.test.tsx b/x-pack/plugins/cases/public/common/use_cases_local_storage.test.tsx
index 740fa78dc3c0..92dd5808b6b7 100644
--- a/x-pack/plugins/cases/public/common/use_cases_local_storage.test.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_local_storage.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import { Subject } from 'rxjs';
import type { AppMockRenderer } from './mock/test_providers';
import { createAppMockRenderer } from './mock/test_providers';
diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
index bb0c0b3a9f53..c1f7d67a8b8b 100644
--- a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
@@ -5,7 +5,6 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
import { useKibana, useToasts } from './lib/kibana';
import type { AppMockRenderer } from './mock';
import { createAppMockRenderer, TestProviders } from './mock';
@@ -14,7 +13,7 @@ import { alertComment, basicComment, mockCase } from '../containers/mock';
import React from 'react';
import userEvent from '@testing-library/user-event';
import type { SupportedCaseAttachment } from '../types';
-import { getByTestId, queryByTestId, screen } from '@testing-library/react';
+import { getByTestId, queryByTestId, screen, renderHook } from '@testing-library/react';
import { OWNER_INFO } from '../../common/constants';
import { useApplication } from './lib/kibana/use_application';
diff --git a/x-pack/plugins/cases/public/common/use_is_user_typing.test.tsx b/x-pack/plugins/cases/public/common/use_is_user_typing.test.tsx
index 229ecc13bba0..d4ec97346996 100644
--- a/x-pack/plugins/cases/public/common/use_is_user_typing.test.tsx
+++ b/x-pack/plugins/cases/public/common/use_is_user_typing.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import type { AppMockRenderer } from './mock';
import { createAppMockRenderer } from './mock';
import { useIsUserTyping } from './use_is_user_typing';
diff --git a/x-pack/plugins/cases/public/common/use_license.test.tsx b/x-pack/plugins/cases/public/common/use_license.test.tsx
index 0c28be2ca746..8a5c29394cc6 100644
--- a/x-pack/plugins/cases/public/common/use_license.test.tsx
+++ b/x-pack/plugins/cases/public/common/use_license.test.tsx
@@ -7,7 +7,7 @@
import React from 'react';
import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { TestProviders } from './mock';
import { useLicense } from './use_license';
diff --git a/x-pack/plugins/cases/public/components/actions/assignees/use_assignees_action.test.tsx b/x-pack/plugins/cases/public/components/actions/assignees/use_assignees_action.test.tsx
index 98cac1dfaf46..78b7801b699f 100644
--- a/x-pack/plugins/cases/public/components/actions/assignees/use_assignees_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/assignees/use_assignees_action.test.tsx
@@ -7,7 +7,7 @@
import type { AppMockRenderer } from '../../../common/mock';
import { createAppMockRenderer } from '../../../common/mock';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useAssigneesAction } from './use_assignees_action';
import * as api from '../../../containers/api';
@@ -56,7 +56,7 @@ describe('useAssigneesAction', () => {
it('update the assignees correctly', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useAssigneesAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -92,7 +92,7 @@ describe('useAssigneesAction', () => {
});
it('shows the success toaster correctly when updating one case', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useAssigneesAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -118,7 +118,7 @@ describe('useAssigneesAction', () => {
});
it('shows the success toaster correctly when updating multiple cases', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useAssigneesAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
diff --git a/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.test.tsx b/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.test.tsx
index 388b3de940ec..2be5f4b83a23 100644
--- a/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.test.tsx
@@ -7,7 +7,7 @@
import type { AppMockRenderer } from '../../../common/mock';
import { createAppMockRenderer } from '../../../common/mock';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useCopyIDAction } from './use_copy_id_action';
import { basicCase } from '../../../containers/mock';
@@ -58,7 +58,7 @@ describe('useCopyIDAction', () => {
});
it('copies the id of the selected case to the clipboard', async () => {
- const { result, waitFor } = renderHook(() => useCopyIDAction({ onActionSuccess }), {
+ const { result } = renderHook(() => useCopyIDAction({ onActionSuccess }), {
wrapper: appMockRender.AppWrapper,
});
@@ -73,7 +73,7 @@ describe('useCopyIDAction', () => {
});
it('shows the success toaster correctly when copying the case id', async () => {
- const { result, waitFor } = renderHook(() => useCopyIDAction({ onActionSuccess }), {
+ const { result } = renderHook(() => useCopyIDAction({ onActionSuccess }), {
wrapper: appMockRender.AppWrapper,
});
diff --git a/x-pack/plugins/cases/public/components/actions/delete/use_delete_action.test.tsx b/x-pack/plugins/cases/public/components/actions/delete/use_delete_action.test.tsx
index 9730783f39af..fee612cbf04f 100644
--- a/x-pack/plugins/cases/public/components/actions/delete/use_delete_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/delete/use_delete_action.test.tsx
@@ -7,7 +7,7 @@
import type { AppMockRenderer } from '../../../common/mock';
import { createAppMockRenderer } from '../../../common/mock';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useDeleteAction } from './use_delete_action';
import * as api from '../../../containers/api';
@@ -84,7 +84,7 @@ describe('useDeleteAction', () => {
it('deletes the selected cases', async () => {
const deleteSpy = jest.spyOn(api, 'deleteCases');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useDeleteAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -112,7 +112,7 @@ describe('useDeleteAction', () => {
});
it('closes the modal', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useDeleteAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -137,7 +137,7 @@ describe('useDeleteAction', () => {
});
it('shows the success toaster correctly when delete one case', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useDeleteAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -163,7 +163,7 @@ describe('useDeleteAction', () => {
});
it('shows the success toaster correctly when delete multiple case', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useDeleteAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
diff --git a/x-pack/plugins/cases/public/components/actions/severity/use_severity_action.test.tsx b/x-pack/plugins/cases/public/components/actions/severity/use_severity_action.test.tsx
index 79ae67610d90..93982ff334c2 100644
--- a/x-pack/plugins/cases/public/components/actions/severity/use_severity_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/severity/use_severity_action.test.tsx
@@ -7,7 +7,7 @@
import type { AppMockRenderer } from '../../../common/mock';
import { createAppMockRenderer } from '../../../common/mock';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useSeverityAction } from './use_severity_action';
import * as api from '../../../containers/api';
@@ -80,7 +80,7 @@ describe('useSeverityAction', () => {
it('update the severity cases', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useSeverityAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -120,7 +120,7 @@ describe('useSeverityAction', () => {
it.each(singleCaseTests)(
'shows the success toaster correctly when updating the severity of the case: %s',
async (_, index, expectedMessage) => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useSeverityAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -153,7 +153,7 @@ describe('useSeverityAction', () => {
it.each(multipleCasesTests)(
'shows the success toaster correctly when updating the severity of the case: %s',
async (_, index, expectedMessage) => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useSeverityAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
diff --git a/x-pack/plugins/cases/public/components/actions/status/use_status_action.test.tsx b/x-pack/plugins/cases/public/components/actions/status/use_status_action.test.tsx
index 5ad7f9803dd6..9a007e5ea28a 100644
--- a/x-pack/plugins/cases/public/components/actions/status/use_status_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/status/use_status_action.test.tsx
@@ -7,7 +7,7 @@
import type { AppMockRenderer } from '../../../common/mock';
import { createAppMockRenderer } from '../../../common/mock';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useStatusAction } from './use_status_action';
import * as api from '../../../containers/api';
@@ -82,7 +82,7 @@ describe('useStatusAction', () => {
it('update the status cases', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useStatusAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -120,7 +120,7 @@ describe('useStatusAction', () => {
it.each(singleCaseTests)(
'shows the success toaster correctly when updating the status of the case: %s',
async (_, index, expectedMessage) => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useStatusAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -152,7 +152,7 @@ describe('useStatusAction', () => {
it.each(multipleCasesTests)(
'shows the success toaster correctly when updating the status of the case: %s',
async (_, index, expectedMessage) => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useStatusAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
diff --git a/x-pack/plugins/cases/public/components/actions/tags/use_tags_action.test.tsx b/x-pack/plugins/cases/public/components/actions/tags/use_tags_action.test.tsx
index 14973cc59be7..dbe2a1cc17aa 100644
--- a/x-pack/plugins/cases/public/components/actions/tags/use_tags_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/tags/use_tags_action.test.tsx
@@ -7,7 +7,7 @@
import type { AppMockRenderer } from '../../../common/mock';
import { createAppMockRenderer } from '../../../common/mock';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useTagsAction } from './use_tags_action';
import * as api from '../../../containers/api';
@@ -56,7 +56,7 @@ describe('useTagsAction', () => {
it('update the tags correctly', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useTagsAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -86,7 +86,7 @@ describe('useTagsAction', () => {
});
it('shows the success toaster correctly when updating one case', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useTagsAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
@@ -112,7 +112,7 @@ describe('useTagsAction', () => {
});
it('shows the success toaster correctly when updating multiple cases', async () => {
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useTagsAction({ onAction, onActionSuccess, isDisabled: false }),
{
wrapper: appMockRender.AppWrapper,
diff --git a/x-pack/plugins/cases/public/components/actions/use_items_action.test.tsx b/x-pack/plugins/cases/public/components/actions/use_items_action.test.tsx
index 25a08007ac31..b1f24562f89b 100644
--- a/x-pack/plugins/cases/public/components/actions/use_items_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/use_items_action.test.tsx
@@ -7,7 +7,7 @@
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useItemsAction } from './use_items_action';
import * as api from '../../containers/api';
@@ -54,7 +54,7 @@ describe('useItemsAction', () => {
});
it('closes the flyout', async () => {
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -81,7 +81,7 @@ describe('useItemsAction', () => {
it('update the items correctly', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -117,7 +117,7 @@ describe('useItemsAction', () => {
});
it('calls fieldSelector correctly', async () => {
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -142,7 +142,7 @@ describe('useItemsAction', () => {
});
it('calls itemsTransformer correctly', async () => {
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -169,7 +169,7 @@ describe('useItemsAction', () => {
it('removes duplicates', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -203,7 +203,7 @@ describe('useItemsAction', () => {
});
it('shows the success toaster correctly when updating a case', async () => {
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -229,7 +229,7 @@ describe('useItemsAction', () => {
it('do not update cases with no changes', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -254,7 +254,7 @@ describe('useItemsAction', () => {
it('do not update if the selected items are the same but with different order', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -279,7 +279,7 @@ describe('useItemsAction', () => {
it('do not update if the selected items are the same', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -304,7 +304,7 @@ describe('useItemsAction', () => {
it('do not update if selecting and unselecting the same item', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
@@ -329,7 +329,7 @@ describe('useItemsAction', () => {
it('do not update with empty items and no selection', async () => {
const updateSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor } = renderHook(() => useItemsAction(props), {
+ const { result } = renderHook(() => useItemsAction(props), {
wrapper: appMockRender.AppWrapper,
});
diff --git a/x-pack/plugins/cases/public/components/actions/use_items_state.test.tsx b/x-pack/plugins/cases/public/components/actions/use_items_state.test.tsx
index a680ec655652..e0f07eaf1a5c 100644
--- a/x-pack/plugins/cases/public/components/actions/use_items_state.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/use_items_state.test.tsx
@@ -7,7 +7,7 @@
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import { useItemsState } from './use_items_state';
import { basicCase } from '../../containers/mock';
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
index bc540040cce5..5c79aadbcfee 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
@@ -7,8 +7,7 @@
import React from 'react';
import moment from 'moment-timezone';
-import { render, waitFor, screen, within } from '@testing-library/react';
-import { renderHook } from '@testing-library/react-hooks';
+import { render, waitFor, screen, within, renderHook } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { waitForEuiPopoverOpen } from '@elastic/eui/lib/test/rtl';
@@ -27,7 +26,6 @@ import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
import { getEmptyCellValue } from '../empty_value';
import { useKibana } from '../../common/lib/kibana';
import { AllCasesList } from './all_cases_list';
-import type { GetCasesColumn, UseCasesColumnsReturnValue } from './use_cases_columns';
import { useCasesColumns } from './use_cases_columns';
import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
import { registerConnectorsToMockActionRegistry } from '../../common/mock/register_connectors';
@@ -267,10 +265,7 @@ describe.skip('AllCasesListGeneric', () => {
expect(column[key].querySelector('span')).toHaveTextContent(emptyTag);
};
- const { result } = renderHook<
- React.PropsWithChildren,
- UseCasesColumnsReturnValue
- >(() => useCasesColumns(defaultColumnArgs), {
+ const { result } = renderHook(() => useCasesColumns(defaultColumnArgs), {
wrapper: ({ children }) => {children},
});
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
index 644c67b632df..dbe7412a5d7b 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { waitFor } from '@testing-library/react';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook, act } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import type { FC, PropsWithChildren } from 'react';
import React from 'react';
@@ -96,12 +95,11 @@ describe('use cases add to existing case modal hook', () => {
});
it('should throw if called outside of a cases context', () => {
- const { result } = renderHook(() => {
- useCasesAddToExistingCaseModal(defaultParams());
- });
- expect(result.error?.message).toContain(
- 'useCasesContext must be used within a CasesProvider and have a defined value'
- );
+ expect(() =>
+ renderHook(() => {
+ useCasesAddToExistingCaseModal(defaultParams());
+ })
+ ).toThrow(/useCasesContext must be used within a CasesProvider and have a defined value/);
});
it('should dispatch the open action when invoked', () => {
diff --git a/x-pack/plugins/cases/public/components/all_cases/table_filter_config/use_filter_config.test.tsx b/x-pack/plugins/cases/public/components/all_cases/table_filter_config/use_filter_config.test.tsx
index 89419d587237..c38486dfb7ea 100644
--- a/x-pack/plugins/cases/public/components/all_cases/table_filter_config/use_filter_config.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/table_filter_config/use_filter_config.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import type { AppMockRenderer } from '../../../common/mock';
import { createAppMockRenderer } from '../../../common/mock';
import type { FilterConfig, FilterConfigRenderParams } from './types';
@@ -64,7 +64,7 @@ describe('useFilterConfig', () => {
it('should remove a selected option if the filter is deleted', async () => {
const { rerender } = renderHook(useFilterConfig, {
- wrapper: ({ children }: React.PropsWithChildren[0]>) => (
+ wrapper: ({ children }: React.PropsWithChildren) => (
{children}
),
initialProps: {
@@ -106,7 +106,7 @@ describe('useFilterConfig', () => {
);
const { result } = renderHook(useFilterConfig, {
- wrapper: ({ children }: React.PropsWithChildren[0]>) => (
+ wrapper: ({ children }: React.PropsWithChildren) => (
{children}
),
initialProps: {
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_actions.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_actions.test.tsx
index bb0ba6ed009e..e98926bcd0b4 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_actions.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_actions.test.tsx
@@ -6,8 +6,7 @@
*/
import userEvent, { type UserEvent } from '@testing-library/user-event';
-import { waitFor } from '@testing-library/react';
-import { renderHook } from '@testing-library/react-hooks/dom';
+import { waitFor, renderHook } from '@testing-library/react';
import {
waitForEuiPopoverOpen,
waitForEuiContextMenuPanelTransition,
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.test.tsx
index 1e257c8fbcef..511edce760a4 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_all_cases_state.test.tsx
@@ -6,8 +6,7 @@
*/
import React from 'react';
-import { renderHook, act } from '@testing-library/react-hooks';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook, act } from '@testing-library/react';
import { CaseStatuses } from '@kbn/cases-components';
import { TestProviders } from '../../common/mock';
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_bulk_actions.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_bulk_actions.test.tsx
index 1838ee3b14f5..2bbd7da38545 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_bulk_actions.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_bulk_actions.test.tsx
@@ -8,8 +8,7 @@
import React from 'react';
import { EuiContextMenu } from '@elastic/eui';
import userEvent from '@testing-library/user-event';
-import { waitFor } from '@testing-library/react';
-import { renderHook } from '@testing-library/react-hooks/dom';
+import { waitFor, renderHook } from '@testing-library/react';
import type { AppMockRenderer } from '../../common/mock';
import {
@@ -190,7 +189,7 @@ describe('useBulkActions', () => {
it('change the status of cases', async () => {
const updateCasesSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCase] }),
{
wrapper: appMockRender.AppWrapper,
@@ -219,7 +218,7 @@ describe('useBulkActions', () => {
pointerEventsCheck: 0,
});
- await waitForHook(() => {
+ await waitFor(() => {
expect(updateCasesSpy).toHaveBeenCalled();
});
});
@@ -227,7 +226,7 @@ describe('useBulkActions', () => {
it('change the severity of cases', async () => {
const updateCasesSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCase] }),
{
wrapper: appMockRender.AppWrapper,
@@ -257,7 +256,7 @@ describe('useBulkActions', () => {
pointerEventsCheck: 0,
});
- await waitForHook(() => {
+ await waitFor(() => {
expect(updateCasesSpy).toHaveBeenCalled();
});
});
@@ -266,7 +265,7 @@ describe('useBulkActions', () => {
it('delete a case', async () => {
const deleteSpy = jest.spyOn(api, 'deleteCases');
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCase] }),
{
wrapper: appMockRender.AppWrapper,
@@ -299,7 +298,7 @@ describe('useBulkActions', () => {
await userEvent.click(res.getByTestId('confirmModalConfirmButton'));
- await waitForHook(() => {
+ await waitFor(() => {
expect(deleteSpy).toHaveBeenCalled();
});
});
@@ -355,7 +354,7 @@ describe('useBulkActions', () => {
it('change the tags of the case', async () => {
const updateCasesSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCase] }),
{
wrapper: appMockRender.AppWrapper,
@@ -394,7 +393,7 @@ describe('useBulkActions', () => {
await userEvent.click(res.getByText('coke'));
await userEvent.click(res.getByTestId('cases-edit-tags-flyout-submit'));
- await waitForHook(() => {
+ await waitFor(() => {
expect(updateCasesSpy).toHaveBeenCalled();
});
});
@@ -402,7 +401,7 @@ describe('useBulkActions', () => {
it('change the assignees of the case', async () => {
const updateCasesSpy = jest.spyOn(api, 'updateCases');
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCase] }),
{
wrapper: appMockRender.AppWrapper,
@@ -441,7 +440,7 @@ describe('useBulkActions', () => {
await userEvent.click(res.getByText('Damaged Raccoon'));
await userEvent.click(res.getByTestId('cases-edit-assignees-flyout-submit'));
- await waitForHook(() => {
+ await waitFor(() => {
expect(updateCasesSpy).toHaveBeenCalled();
});
});
@@ -450,7 +449,7 @@ describe('useBulkActions', () => {
describe('Permissions', () => {
it('shows the correct actions with all permissions', async () => {
appMockRender = createAppMockRenderer({ permissions: allCasesPermissions() });
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCase] }),
{
wrapper: appMockRender.AppWrapper,
@@ -467,7 +466,7 @@ describe('useBulkActions', () => {
);
- await waitForHook(() => {
+ await waitFor(() => {
expect(res.getByTestId('case-bulk-action-status')).toBeInTheDocument();
expect(res.getByTestId('cases-bulk-action-delete')).toBeInTheDocument();
expect(res.getByTestId('bulk-actions-separator')).toBeInTheDocument();
@@ -476,7 +475,7 @@ describe('useBulkActions', () => {
it('shows the correct actions with no delete permissions', async () => {
appMockRender = createAppMockRenderer({ permissions: noDeleteCasesPermissions() });
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCase] }),
{
wrapper: appMockRender.AppWrapper,
@@ -493,7 +492,7 @@ describe('useBulkActions', () => {
);
- await waitForHook(() => {
+ await waitFor(() => {
expect(res.getByTestId('case-bulk-action-status')).toBeInTheDocument();
expect(res.queryByTestId('cases-bulk-action-delete')).toBeFalsy();
expect(res.queryByTestId('bulk-actions-separator')).toBeFalsy();
@@ -502,7 +501,7 @@ describe('useBulkActions', () => {
it('shows the correct actions with only delete permissions', async () => {
appMockRender = createAppMockRenderer({ permissions: onlyDeleteCasesPermission() });
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCase] }),
{
wrapper: appMockRender.AppWrapper,
@@ -519,7 +518,7 @@ describe('useBulkActions', () => {
);
- await waitForHook(() => {
+ await waitFor(() => {
expect(res.queryByTestId('case-bulk-action-status')).toBeFalsy();
expect(res.getByTestId('cases-bulk-action-delete')).toBeInTheDocument();
expect(res.queryByTestId('bulk-actions-separator')).toBeFalsy();
@@ -528,7 +527,7 @@ describe('useBulkActions', () => {
it('shows the correct actions with no reopen permissions', async () => {
appMockRender = createAppMockRenderer({ permissions: noReopenCasesPermissions() });
- const { result, waitFor: waitForHook } = renderHook(
+ const { result } = renderHook(
() => useBulkActions({ onAction, onActionSuccess, selectedCases: [basicCaseClosed] }),
{
wrapper: appMockRender.AppWrapper,
@@ -545,12 +544,12 @@ describe('useBulkActions', () => {
);
- await waitForHook(() => {
+ await waitFor(() => {
expect(res.queryByTestId('case-bulk-action-status')).toBeInTheDocument();
res.queryByTestId('case-bulk-action-status')?.click();
});
- await waitForHook(() => {
+ await waitFor(() => {
expect(res.queryByTestId('cases-bulk-action-status-open')).toBeDisabled();
expect(res.queryByTestId('cases-bulk-action-status-in-progress')).toBeDisabled();
expect(res.queryByTestId('cases-bulk-action-status-closed')).toBeDisabled();
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
index 22783cf05cfc..550240060ddf 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
@@ -15,7 +15,7 @@ import { useGetCasesMockState } from '../../containers/mock';
import { connectors, useCaseConfigureResponse } from '../configure_cases/__mock__';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer, readCasesPermissions, TestProviders } from '../../common/mock';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { CaseStatuses, CustomFieldTypes } from '../../../common/types/domain';
import { userProfilesMap } from '../../containers/user_profiles/api.mock';
import { useGetCaseConfiguration } from '../../containers/configure/use_get_case_configuration';
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns_configuration.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns_configuration.test.tsx
index 761da1d6316e..4a4a139445c5 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns_configuration.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns_configuration.test.tsx
@@ -6,7 +6,7 @@
*/
import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns_selection.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns_selection.test.tsx
index 26f0f8c2fb85..e6603a35a1a0 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns_selection.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns_selection.test.tsx
@@ -6,7 +6,7 @@
*/
import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import type { AppMockRenderer } from '../../common/mock';
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.test.tsx
index 484fabca00c3..338055e5da0c 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_on_refresh_cases.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
import { casesQueriesKeys } from '../../containers/constants';
diff --git a/x-pack/plugins/cases/public/components/app/use_available_owners.test.ts b/x-pack/plugins/cases/public/components/app/use_available_owners.test.ts
index 4cd015de0c92..5a19e9a0f995 100644
--- a/x-pack/plugins/cases/public/components/app/use_available_owners.test.ts
+++ b/x-pack/plugins/cases/public/components/app/use_available_owners.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { APP_ID, OBSERVABILITY_OWNER, SECURITY_SOLUTION_OWNER } from '../../../common/constants';
import { useKibana } from '../../common/lib/kibana';
diff --git a/x-pack/plugins/cases/public/components/app/use_readonly_header.test.tsx b/x-pack/plugins/cases/public/components/app/use_readonly_header.test.tsx
index 9be5a6336b3c..69d7a9a8b65a 100644
--- a/x-pack/plugins/cases/public/components/app/use_readonly_header.test.tsx
+++ b/x-pack/plugins/cases/public/components/app/use_readonly_header.test.tsx
@@ -6,7 +6,7 @@
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { useKibana } from '../../common/lib/kibana';
import { readCasesPermissions, TestProviders } from '../../common/mock';
diff --git a/x-pack/plugins/cases/public/components/cases_context/state/use_is_add_to_case_open.test.tsx b/x-pack/plugins/cases/public/components/cases_context/state/use_is_add_to_case_open.test.tsx
index 9974d0cb530d..61cf35522966 100644
--- a/x-pack/plugins/cases/public/components/cases_context/state/use_is_add_to_case_open.test.tsx
+++ b/x-pack/plugins/cases/public/components/cases_context/state/use_is_add_to_case_open.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import { useCasesAddToExistingCaseModal } from '../../all_cases/selector_modal/use_cases_add_to_existing_case_modal';
import { createAppMockRenderer } from '../../../common/mock';
import { useIsAddToCaseOpen } from './use_is_add_to_case_open';
@@ -26,9 +26,8 @@ describe('use is add to existing case modal open hook', () => {
});
it('should throw if called outside of a cases context', () => {
- const { result } = renderHook(useIsAddToCaseOpen);
- expect(result.error?.message).toContain(
- 'useCasesStateContext must be used within a CasesProvider and have a defined value'
+ expect(() => renderHook(useIsAddToCaseOpen)).toThrow(
+ /useCasesStateContext must be used within a CasesProvider and have a defined value/
);
});
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.test.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.test.tsx
index f1cb277f1a24..b529139644d5 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana, useToasts } from '../../../common/lib/kibana';
import { connector } from '../mock';
@@ -30,7 +30,7 @@ describe('useGetFieldsByIssueType', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getFieldsByIssueType');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetFieldsByIssueType({
http,
@@ -88,7 +88,7 @@ describe('useGetFieldsByIssueType', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetFieldsByIssueType({
http,
@@ -114,7 +114,7 @@ describe('useGetFieldsByIssueType', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetFieldsByIssueType({
http,
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue.test.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue.test.tsx
index 876738025e6a..04f1995f6cc8 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana, useToasts } from '../../../common/lib/kibana';
import { connector as actionConnector } from '../mock';
@@ -30,7 +30,7 @@ describe('useGetIssue', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getIssue');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetIssue({
http,
@@ -40,7 +40,7 @@ describe('useGetIssue', () => {
{ wrapper: appMockRender.AppWrapper }
);
- await waitFor(() => result.current.isSuccess);
+ await waitFor(() => expect(result.current.isSuccess).toBe(true));
expect(spy).toHaveBeenCalledWith({
http,
@@ -88,7 +88,7 @@ describe('useGetIssue', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetIssue({
http,
@@ -98,9 +98,10 @@ describe('useGetIssue', () => {
{ wrapper: appMockRender.AppWrapper }
);
- await waitFor(() => result.current.isError);
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(result.current.isError).toBe(true);
+ expect(addError).toHaveBeenCalled();
+ });
});
it('calls addError when the getIssue api returns successfully but contains an error', async () => {
@@ -114,7 +115,7 @@ describe('useGetIssue', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetIssue({
http,
@@ -124,8 +125,9 @@ describe('useGetIssue', () => {
{ wrapper: appMockRender.AppWrapper }
);
- await waitFor(() => result.current.isSuccess);
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(result.current.isSuccess).toBe(true);
+ expect(addError).toHaveBeenCalled();
+ });
});
});
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.test.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.test.tsx
index 0d7e3127dd9f..dde59c2dd64b 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana, useToasts } from '../../../common/lib/kibana';
import { connector } from '../mock';
@@ -30,7 +30,7 @@ describe('useGetIssueTypes', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getIssueTypes');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetIssueTypes({
http,
@@ -70,7 +70,7 @@ describe('useGetIssueTypes', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetIssueTypes({
http,
@@ -95,7 +95,7 @@ describe('useGetIssueTypes', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetIssueTypes({
http,
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.test.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.test.tsx
index a06cd4391f76..b43a231e4eb0 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana, useToasts } from '../../../common/lib/kibana';
import { connector as actionConnector } from '../mock';
@@ -30,7 +30,7 @@ describe('useGetIssues', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getIssues');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetIssues({
http,
@@ -40,13 +40,14 @@ describe('useGetIssues', () => {
{ wrapper: appMockRender.AppWrapper }
);
- await waitFor(() => result.current.isSuccess);
-
- expect(spy).toHaveBeenCalledWith({
- http,
- signal: expect.anything(),
- connectorId: actionConnector.id,
- title: 'Task',
+ await waitFor(() => {
+ expect(result.current.isSuccess).toBe(true);
+ expect(spy).toHaveBeenCalledWith({
+ http,
+ signal: expect.anything(),
+ connectorId: actionConnector.id,
+ title: 'Task',
+ });
});
});
@@ -74,7 +75,7 @@ describe('useGetIssues', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetIssues({
http,
@@ -84,9 +85,10 @@ describe('useGetIssues', () => {
{ wrapper: appMockRender.AppWrapper }
);
- await waitFor(() => result.current.isError);
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(result.current.isError).toBe(true);
+ expect(addError).toHaveBeenCalled();
+ });
});
it('calls addError when the getIssues api returns successfully but contains an error', async () => {
@@ -100,7 +102,7 @@ describe('useGetIssues', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetIssues({
http,
@@ -110,8 +112,9 @@ describe('useGetIssues', () => {
{ wrapper: appMockRender.AppWrapper }
);
- await waitFor(() => result.current.isSuccess);
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(result.current.isSuccess).toBe(true);
+ expect(addError).toHaveBeenCalled();
+ });
});
});
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.test.tsx b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.test.tsx
index 7bd0c16a6a4d..bfe20b4dc4de 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana, useToasts } from '../../../common/lib/kibana';
import { connector } from '../mock';
@@ -30,7 +30,7 @@ describe('useGetIncidentTypes', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getIncidentTypes');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetIncidentTypes({
http,
@@ -70,7 +70,7 @@ describe('useGetIncidentTypes', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetIncidentTypes({
http,
@@ -95,7 +95,7 @@ describe('useGetIncidentTypes', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetIncidentTypes({
http,
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.test.tsx b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.test.tsx
index 6f59b4d50c31..71d09a0cc68e 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana, useToasts } from '../../../common/lib/kibana';
import { connector } from '../mock';
@@ -30,7 +30,7 @@ describe('useGetSeverity', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getSeverity');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() =>
useGetSeverity({
http,
@@ -70,7 +70,7 @@ describe('useGetSeverity', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetSeverity({
http,
@@ -95,7 +95,7 @@ describe('useGetSeverity', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetSeverity({
http,
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.test.tsx b/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.test.tsx
index 150881761950..3f44f4c30f7c 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana, useToasts } from '../../../common/lib/kibana';
import type { ActionConnector } from '../../../../common/types/domain';
@@ -47,7 +47,7 @@ describe('useGetChoices', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getChoices');
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetChoices({
http,
@@ -92,7 +92,7 @@ describe('useGetChoices', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetChoices({
http,
@@ -118,7 +118,7 @@ describe('useGetChoices', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess: jest.fn(), addError });
- const { waitFor } = renderHook(
+ renderHook(
() =>
useGetChoices({
http,
diff --git a/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.test.tsx b/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.test.tsx
index 168cae0e478f..0d1ad5b8b65b 100644
--- a/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.test.tsx
@@ -6,7 +6,7 @@
*/
import { alertComment } from '../../../containers/mock';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import type { FC, PropsWithChildren } from 'react';
import React from 'react';
import { CasesContext } from '../../cases_context';
@@ -47,12 +47,11 @@ describe('use cases add to new case flyout hook', () => {
});
it('should throw if called outside of a cases context', () => {
- const { result } = renderHook(() => {
- useCasesAddToNewCaseFlyout();
- });
- expect(result.error?.message).toContain(
- 'useCasesContext must be used within a CasesProvider and have a defined value'
- );
+ expect(() =>
+ renderHook(() => {
+ useCasesAddToNewCaseFlyout();
+ })
+ ).toThrow(/useCasesContext must be used within a CasesProvider and have a defined value/);
});
it('should dispatch the open action when invoked without attachments', () => {
diff --git a/x-pack/plugins/cases/public/components/create/use_cancel_creation_action.test.tsx b/x-pack/plugins/cases/public/components/create/use_cancel_creation_action.test.tsx
index 4174d33c44d2..080009feb184 100644
--- a/x-pack/plugins/cases/public/components/create/use_cancel_creation_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/use_cancel_creation_action.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
import { useCancelCreationAction } from './use_cancel_creation_action';
diff --git a/x-pack/plugins/cases/public/components/files/use_file_preview.test.tsx b/x-pack/plugins/cases/public/components/files/use_file_preview.test.tsx
index 49e18fb818cd..f5a502f49077 100644
--- a/x-pack/plugins/cases/public/components/files/use_file_preview.test.tsx
+++ b/x-pack/plugins/cases/public/components/files/use_file_preview.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import { useFilePreview } from './use_file_preview';
diff --git a/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx b/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
index 0467bb7a2efe..a064667f93c0 100644
--- a/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
+++ b/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
@@ -9,7 +9,7 @@ import type { FilesTableColumnsProps } from './use_files_table_columns';
import { useFilesTableColumns } from './use_files_table_columns';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { basicCase } from '../../containers/mock';
describe('useFilesTableColumns', () => {
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/use_markdown_session_storage.test.tsx b/x-pack/plugins/cases/public/components/markdown_editor/use_markdown_session_storage.test.tsx
index e4ce68ed4523..06a92712f63d 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/use_markdown_session_storage.test.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/use_markdown_session_storage.test.tsx
@@ -5,11 +5,9 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { waitFor, renderHook, act } from '@testing-library/react';
import type { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
-import type { SessionStorageType } from './use_markdown_session_storage';
import { useMarkdownSessionStorage } from './use_markdown_session_storage';
-import { waitForComponentToUpdate } from '../../common/test_utils';
describe('useMarkdownSessionStorage', () => {
const field = {
@@ -45,7 +43,7 @@ describe('useMarkdownSessionStorage', () => {
});
it('should return hasConflicts as false', async () => {
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useMarkdownSessionStorage({ field, sessionKey, initialValue })
);
@@ -55,7 +53,7 @@ describe('useMarkdownSessionStorage', () => {
});
it('should return hasConflicts as false when sessionKey is empty', async () => {
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useMarkdownSessionStorage({ field, sessionKey: '', initialValue })
);
@@ -66,7 +64,7 @@ describe('useMarkdownSessionStorage', () => {
});
it('should update the session value with field value when it is first render', async () => {
- const { waitFor } = renderHook(
+ renderHook(
(props) => {
return useMarkdownSessionStorage(props);
},
@@ -86,7 +84,7 @@ describe('useMarkdownSessionStorage', () => {
it('should set session storage when field has value and session key is not created yet', async () => {
const specialCharsValue = '!{tooltip[Hello again](This is tooltip!)}';
- const { waitFor, result } = renderHook(
+ const { result } = renderHook(
(props) => {
return useMarkdownSessionStorage(props);
},
@@ -101,8 +99,6 @@ describe('useMarkdownSessionStorage', () => {
jest.advanceTimersByTime(1000);
});
- await waitForComponentToUpdate();
-
await waitFor(() => {
expect(result.current.hasConflicts).toBe(false);
expect(sessionStorage.getItem(sessionKey)).toBe(specialCharsValue);
@@ -110,7 +106,7 @@ describe('useMarkdownSessionStorage', () => {
});
it('should update session value ', async () => {
- const { result, rerender, waitFor } = renderHook(
+ const { result, rerender } = renderHook(
(props) => {
return useMarkdownSessionStorage(props);
},
@@ -129,8 +125,6 @@ describe('useMarkdownSessionStorage', () => {
jest.advanceTimersByTime(1000);
});
- await waitForComponentToUpdate();
-
await waitFor(() => {
expect(result.current.hasConflicts).toBe(false);
expect(sessionStorage.getItem(sessionKey)).toBe('new value');
@@ -138,7 +132,7 @@ describe('useMarkdownSessionStorage', () => {
});
it('should return has conflict true', async () => {
- const { result, rerender, waitFor } = renderHook(
+ const { result, rerender } = renderHook(
(props) => {
return useMarkdownSessionStorage(props);
},
@@ -162,7 +156,7 @@ describe('useMarkdownSessionStorage', () => {
});
it('should set field value if session already exists and it is a first render', async () => {
- const { waitFor, result } = renderHook(
+ const { result } = renderHook(
(props) => {
return useMarkdownSessionStorage(props);
},
@@ -171,8 +165,6 @@ describe('useMarkdownSessionStorage', () => {
}
);
- await waitForComponentToUpdate();
-
await waitFor(() => {
expect(field.setValue).toHaveBeenCalled();
});
@@ -181,8 +173,6 @@ describe('useMarkdownSessionStorage', () => {
jest.advanceTimersByTime(1000);
});
- await waitForComponentToUpdate();
-
await waitFor(() => {
expect(result.current.hasConflicts).toBe(false);
expect(field.value).toBe(sessionStorage.getItem(sessionKey));
@@ -190,10 +180,7 @@ describe('useMarkdownSessionStorage', () => {
});
it('should update existing session key if field value changed', async () => {
- const { waitFor, rerender, result } = renderHook<
- SessionStorageType,
- { hasConflicts: boolean }
- >(
+ const { rerender, result } = renderHook(
(props) => {
return useMarkdownSessionStorage(props);
},
@@ -202,8 +189,6 @@ describe('useMarkdownSessionStorage', () => {
}
);
- await waitForComponentToUpdate();
-
await waitFor(() => {
expect(field.setValue).toHaveBeenCalled();
});
@@ -218,8 +203,6 @@ describe('useMarkdownSessionStorage', () => {
jest.advanceTimersByTime(1000);
});
- await waitForComponentToUpdate();
-
await waitFor(() => {
expect(result.current.hasConflicts).toBe(false);
expect(sessionStorage.getItem(sessionKey)).toBe('new value');
diff --git a/x-pack/plugins/cases/public/components/use_breadcrumbs/index.test.tsx b/x-pack/plugins/cases/public/components/use_breadcrumbs/index.test.tsx
index 9f48783fde24..b494bd1d8183 100644
--- a/x-pack/plugins/cases/public/components/use_breadcrumbs/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/use_breadcrumbs/index.test.tsx
@@ -7,7 +7,7 @@
import type { ReactNode } from 'react';
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { TestProviders } from '../../common/mock';
import { useCasesBreadcrumbs, useCasesTitleBreadcrumbs } from '.';
import { CasesDeepLinkId } from '../../common/navigation';
diff --git a/x-pack/plugins/cases/public/components/use_create_case_modal/index.test.tsx b/x-pack/plugins/cases/public/components/use_create_case_modal/index.test.tsx
index dcef6d26393a..56599299fd0a 100644
--- a/x-pack/plugins/cases/public/components/use_create_case_modal/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/use_create_case_modal/index.test.tsx
@@ -6,10 +6,10 @@
*/
import React from 'react';
-import { renderHook, act } from '@testing-library/react-hooks';
+
+import { renderHook, act } from '@testing-library/react';
import { useKibana } from '../../common/lib/kibana';
-import type { UseCreateCaseModalProps, UseCreateCaseModalReturnedValues } from '.';
import { useCreateCaseModal } from '.';
import { TestProviders } from '../../common/mock';
@@ -27,10 +27,7 @@ describe('useCreateCaseModal', () => {
});
it('init', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- UseCreateCaseModalReturnedValues
- >(() => useCreateCaseModal({ onCaseCreated }), {
+ const { result } = renderHook(() => useCreateCaseModal({ onCaseCreated }), {
wrapper: ({ children }) => {children},
});
@@ -38,10 +35,7 @@ describe('useCreateCaseModal', () => {
});
it('opens the modal', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- UseCreateCaseModalReturnedValues
- >(() => useCreateCaseModal({ onCaseCreated }), {
+ const { result } = renderHook(() => useCreateCaseModal({ onCaseCreated }), {
wrapper: ({ children }) => {children},
});
@@ -53,10 +47,7 @@ describe('useCreateCaseModal', () => {
});
it('closes the modal', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- UseCreateCaseModalReturnedValues
- >(() => useCreateCaseModal({ onCaseCreated }), {
+ const { result } = renderHook(() => useCreateCaseModal({ onCaseCreated }), {
wrapper: ({ children }) => {children},
});
@@ -69,10 +60,7 @@ describe('useCreateCaseModal', () => {
});
it('returns a memoized value', async () => {
- const { result, rerender } = renderHook<
- React.PropsWithChildren,
- UseCreateCaseModalReturnedValues
- >(() => useCreateCaseModal({ onCaseCreated }), {
+ const { result, rerender } = renderHook(() => useCreateCaseModal({ onCaseCreated }), {
wrapper: ({ children }) => {children},
});
@@ -84,10 +72,7 @@ describe('useCreateCaseModal', () => {
});
it('closes the modal when creating a case', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- UseCreateCaseModalReturnedValues
- >(() => useCreateCaseModal({ onCaseCreated }), {
+ const { result } = renderHook(() => useCreateCaseModal({ onCaseCreated }), {
wrapper: ({ children }) => {children},
});
diff --git a/x-pack/plugins/cases/public/components/use_push_to_service/index.test.tsx b/x-pack/plugins/cases/public/components/use_push_to_service/index.test.tsx
index 75c2694f8947..02e1a99fd063 100644
--- a/x-pack/plugins/cases/public/components/use_push_to_service/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/use_push_to_service/index.test.tsx
@@ -6,9 +6,8 @@
*/
import React from 'react';
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
-import type { ReturnUsePushToService, UsePushToService } from '.';
import { usePushToService } from '.';
import { noPushCasesPermissions, readCasesPermissions, TestProviders } from '../../common/mock';
import { usePostPushToService } from '../../containers/use_post_push_to_service';
@@ -67,10 +66,7 @@ describe('usePushToService', () => {
});
it('calls pushCaseToExternalService with correct arguments', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
@@ -93,10 +89,7 @@ describe('usePushToService', () => {
},
}));
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
@@ -115,10 +108,7 @@ describe('usePushToService', () => {
},
}));
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
@@ -129,10 +119,7 @@ describe('usePushToService', () => {
});
it('Displays message when user has select none as connector', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -155,10 +142,7 @@ describe('usePushToService', () => {
});
it('Displays message when connector is deleted', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -182,10 +166,7 @@ describe('usePushToService', () => {
});
it('should not call pushCaseToExternalService when the selected connector is none', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -209,10 +190,7 @@ describe('usePushToService', () => {
});
it('refresh case view page after push', async () => {
- const { result, waitFor } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
@@ -227,10 +205,7 @@ describe('usePushToService', () => {
describe('user does not have write or push permissions', () => {
it('returns correct information about push permissions', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => (
{children}
),
@@ -248,10 +223,7 @@ describe('usePushToService', () => {
},
}));
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => (
{children}
),
@@ -270,10 +242,7 @@ describe('usePushToService', () => {
},
}));
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => (
{children}
),
@@ -284,10 +253,7 @@ describe('usePushToService', () => {
});
it('does not display a message when user does not have any connector configured', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -310,10 +276,7 @@ describe('usePushToService', () => {
});
it('does not display a message when user does have a connector but is configured to none', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -336,10 +299,7 @@ describe('usePushToService', () => {
});
it('does not display a message when connector is deleted', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -363,10 +323,7 @@ describe('usePushToService', () => {
});
it('does not display a message when case is closed', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -386,10 +343,7 @@ describe('usePushToService', () => {
describe('returned values', () => {
it('initial', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
@@ -408,10 +362,7 @@ describe('usePushToService', () => {
it('isLoading is true when usePostPushToService is loading', async () => {
usePostPushToServiceMock.mockReturnValue({ ...mockPostPush, isLoading: true });
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
@@ -424,10 +375,7 @@ describe('usePushToService', () => {
data: actionLicense,
});
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
@@ -435,21 +383,18 @@ describe('usePushToService', () => {
});
it('hasErrorMessages=true if there are error messages', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService({ ...defaultArgs, isValidConnector: false }), {
- wrapper: ({ children }) => {children},
- });
+ const { result } = renderHook(
+ () => usePushToService({ ...defaultArgs, isValidConnector: false }),
+ {
+ wrapper: ({ children }) => {children},
+ }
+ );
expect(result.current.hasErrorMessages).toBe(true);
});
it('needsToBePushed=true if the connector needs to be pushed', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -473,10 +418,7 @@ describe('usePushToService', () => {
});
it('needsToBePushed=false if the connector does not exist', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -497,10 +439,7 @@ describe('usePushToService', () => {
});
it('hasBeenPushed=false if the connector has been pushed', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -524,10 +463,7 @@ describe('usePushToService', () => {
});
it('hasBeenPushed=false if the connector does not exist', async () => {
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(
+ const { result } = renderHook(
() =>
usePushToService({
...defaultArgs,
@@ -553,10 +489,7 @@ describe('usePushToService', () => {
data: actionLicense,
});
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => (
{children}
),
@@ -574,10 +507,7 @@ describe('usePushToService', () => {
},
}));
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
@@ -590,10 +520,7 @@ describe('usePushToService', () => {
data: undefined,
}));
- const { result } = renderHook<
- React.PropsWithChildren,
- ReturnUsePushToService
- >(() => usePushToService(defaultArgs), {
+ const { result } = renderHook(() => usePushToService(defaultArgs), {
wrapper: ({ children }) => {children},
});
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions/use_delete_property_action.test.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions/use_delete_property_action.test.tsx
index 2db865ee3b22..dba35699e2d8 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions/use_delete_property_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions/use_delete_property_action.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import type { AppMockRenderer } from '../../../common/mock';
import { createAppMockRenderer } from '../../../common/mock';
import { useDeletePropertyAction } from './use_delete_property_action';
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_last_page.test.tsx b/x-pack/plugins/cases/public/components/user_actions/use_last_page.test.tsx
index 525fe19771e4..a05097e7f7b2 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_last_page.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_last_page.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { useLastPage } from './use_last_page';
import type { UserActivityParams } from '../user_actions_activity_bar/types';
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
index 3600a247540f..4acd8ce0ee10 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
@@ -7,7 +7,7 @@
import type { FC, PropsWithChildren } from 'react';
import React from 'react';
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import { basicCase } from '../../containers/mock';
import { useUpdateComment } from '../../containers/use_update_comment';
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.test.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.test.tsx
index 3207e4ffb13f..ec50c60bb559 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useLastPageUserActions } from './use_user_actions_last_page';
import type { UserActivityParams } from '../user_actions_activity_bar/types';
@@ -32,7 +32,7 @@ describe('useLastPageUserActions', () => {
});
it('renders correctly', async () => {
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useLastPageUserActions({
lastPage: 5,
userActivityQueryParams,
@@ -79,7 +79,7 @@ describe('useLastPageUserActions', () => {
it('returns loading state correctly', async () => {
useFindCaseUserActionsMock.mockReturnValue({ isLoading: true });
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useLastPageUserActions({
lastPage: 2,
userActivityQueryParams,
@@ -108,7 +108,7 @@ describe('useLastPageUserActions', () => {
it('returns empty array when data is undefined', async () => {
useFindCaseUserActionsMock.mockReturnValue({ isLoading: false, data: undefined });
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useLastPageUserActions({
lastPage: 2,
userActivityQueryParams,
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.test.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.test.tsx
index 0d005a8b404f..21702583e029 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useUserActionsPagination } from './use_user_actions_pagination';
import type { UserActivityParams } from '../user_actions_activity_bar/types';
@@ -32,7 +32,7 @@ describe('useUserActionsPagination', () => {
});
it('renders expandable option correctly when user actions are more than 10', async () => {
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useUserActionsPagination({
userActivityQueryParams,
caseId: basicCase.id,
@@ -62,7 +62,7 @@ describe('useUserActionsPagination', () => {
});
it('renders less than 10 user actions correctly', async () => {
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useUserActionsPagination({
userActivityQueryParams,
caseId: basicCase.id,
@@ -92,7 +92,7 @@ describe('useUserActionsPagination', () => {
it('returns loading state correctly', async () => {
useInfiniteFindCaseUserActionsMock.mockReturnValue({ isLoading: true });
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useUserActionsPagination({
userActivityQueryParams,
caseId: basicCase.id,
@@ -124,7 +124,7 @@ describe('useUserActionsPagination', () => {
it('returns empty array when data is undefined', async () => {
useInfiniteFindCaseUserActionsMock.mockReturnValue({ isLoading: false, data: undefined });
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useUserActionsPagination({
userActivityQueryParams,
caseId: basicCase.id,
@@ -161,7 +161,7 @@ describe('useUserActionsPagination', () => {
},
});
- const { result, waitFor } = renderHook(() =>
+ const { result } = renderHook(() =>
useUserActionsPagination({
userActivityQueryParams,
caseId: basicCase.id,
diff --git a/x-pack/plugins/cases/public/containers/configure/use_action_types.test.tsx b/x-pack/plugins/cases/public/containers/configure/use_action_types.test.tsx
index 5718b07438a9..99d79484b17c 100644
--- a/x-pack/plugins/cases/public/containers/configure/use_action_types.test.tsx
+++ b/x-pack/plugins/cases/public/containers/configure/use_action_types.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import * as api from './api';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
@@ -43,10 +43,10 @@ describe('useActionTypes', () => {
(useToasts as jest.Mock).mockReturnValue({ addError: addErrorMock });
- const { waitForNextUpdate } = renderHook(() => useGetActionTypes(), {
+ renderHook(() => useGetActionTypes(), {
wrapper: appMockRenderer.AppWrapper,
});
- await waitForNextUpdate({ timeout: 2000 });
- expect(addErrorMock).toHaveBeenCalled();
+
+ await waitFor(() => expect(addErrorMock).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/configure/use_get_all_case_configurations.test.ts b/x-pack/plugins/cases/public/containers/configure/use_get_all_case_configurations.test.ts
index cd9e44d1bdaa..52d4df20e540 100644
--- a/x-pack/plugins/cases/public/containers/configure/use_get_all_case_configurations.test.ts
+++ b/x-pack/plugins/cases/public/containers/configure/use_get_all_case_configurations.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useGetAllCaseConfigurations } from './use_get_all_case_configurations';
import * as api from './api';
import type { AppMockRenderer } from '../../common/mock';
@@ -32,18 +32,11 @@ describe('Use get all case configurations hook', () => {
{ id: 'my-configuration-3', owner: '3' },
]);
- const { result, waitForNextUpdate } = renderHook(() => useGetAllCaseConfigurations(), {
+ const { result } = renderHook(() => useGetAllCaseConfigurations(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- /**
- * Ensures that the initial data is returnedâ‰
- * before fetching
- */
- // @ts-expect-error: data is defined
- expect(result.all[0].data).toEqual([
+ expect(result.current.data).toEqual([
{
closureType: 'close-by-user',
connector: { fields: null, id: 'none', name: 'none', type: '.none' },
@@ -56,43 +49,36 @@ describe('Use get all case configurations hook', () => {
},
]);
- /**
- * The response after fetching
- */
- // @ts-expect-error: data is defined
- expect(result.all[1].data).toEqual([
- { id: 'my-configuration-1', owner: '1' },
- { id: 'my-configuration-2', owner: '2' },
- { id: 'my-configuration-3', owner: '3' },
- ]);
+ await waitFor(() =>
+ expect(result.current.data).toEqual([
+ { id: 'my-configuration-1', owner: '1' },
+ { id: 'my-configuration-2', owner: '2' },
+ { id: 'my-configuration-3', owner: '3' },
+ ])
+ );
});
it('returns the initial configuration if none is available', async () => {
const spy = jest.spyOn(api, 'getCaseConfigure');
spy.mockResolvedValue([]);
- const { result, waitForNextUpdate } = renderHook(() => useGetAllCaseConfigurations(), {
+ const { result } = renderHook(() => useGetAllCaseConfigurations(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- /**
- * Ensures that the initial data is returnedâ‰
- * before fetching
- */
- // @ts-expect-error: data is defined
- expect(result.all[0].data).toEqual([
- {
- closureType: 'close-by-user',
- connector: { fields: null, id: 'none', name: 'none', type: '.none' },
- customFields: [],
- templates: [],
- id: '',
- mappings: [],
- version: '',
- owner: '',
- },
- ]);
+ await waitFor(() =>
+ expect(result.current.data).toEqual([
+ {
+ closureType: 'close-by-user',
+ connector: { fields: null, id: 'none', name: 'none', type: '.none' },
+ customFields: [],
+ templates: [],
+ id: '',
+ mappings: [],
+ version: '',
+ owner: '',
+ },
+ ])
+ );
});
});
diff --git a/x-pack/plugins/cases/public/containers/configure/use_get_case_configuration.test.tsx b/x-pack/plugins/cases/public/containers/configure/use_get_case_configuration.test.tsx
index e504bd22e9cc..35faebd12a78 100644
--- a/x-pack/plugins/cases/public/containers/configure/use_get_case_configuration.test.tsx
+++ b/x-pack/plugins/cases/public/containers/configure/use_get_case_configuration.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useGetCaseConfiguration } from './use_get_case_configuration';
import * as api from './api';
import type { AppMockRenderer } from '../../common/mock';
@@ -35,16 +35,14 @@ describe('Use get case configuration hook', () => {
targetConfiguration,
]);
- const { result, waitForNextUpdate } = renderHook(() => useGetCaseConfiguration(), {
+ const { result } = renderHook(() => useGetCaseConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
/**
* The response after fetching
*/
- expect(result.current.data).toEqual(targetConfiguration);
+ await waitFor(() => expect(result.current.data).toEqual(targetConfiguration));
});
it('returns the initial configuration if none matches the owner', async () => {
@@ -59,16 +57,14 @@ describe('Use get case configuration hook', () => {
{ ...initialConfiguration, id: 'my-new-configuration-2', owner: 'bar' },
]);
- const { result, waitForNextUpdate } = renderHook(() => useGetCaseConfiguration(), {
+ const { result } = renderHook(() => useGetCaseConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
/**
* The response after fetching
*/
- expect(result.current.data).toEqual(initialConfiguration);
+ await waitFor(() => expect(result.current.data).toEqual(initialConfiguration));
});
it('returns the initial configuration if none exists', async () => {
@@ -76,16 +72,14 @@ describe('Use get case configuration hook', () => {
spy.mockResolvedValue([]);
- const { result, waitForNextUpdate } = renderHook(() => useGetCaseConfiguration(), {
+ const { result } = renderHook(() => useGetCaseConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
/**
* The response after fetching
*/
- expect(result.current.data).toEqual(initialConfiguration);
+ await waitFor(() => expect(result.current.data).toEqual(initialConfiguration));
});
it('returns the initial configuration if the owner is undefined', async () => {
@@ -94,15 +88,13 @@ describe('Use get case configuration hook', () => {
spy.mockResolvedValue([]);
- const { result, waitForNextUpdate } = renderHook(() => useGetCaseConfiguration(), {
+ const { result } = renderHook(() => useGetCaseConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
/**
* The response after fetching
*/
- expect(result.current.data).toEqual(initialConfiguration);
+ await waitFor(() => expect(result.current.data).toEqual(initialConfiguration));
});
});
diff --git a/x-pack/plugins/cases/public/containers/configure/use_get_case_configurations_query.test.ts b/x-pack/plugins/cases/public/containers/configure/use_get_case_configurations_query.test.ts
index adc06ad840d9..02cb83442144 100644
--- a/x-pack/plugins/cases/public/containers/configure/use_get_case_configurations_query.test.ts
+++ b/x-pack/plugins/cases/public/containers/configure/use_get_case_configurations_query.test.ts
@@ -5,10 +5,9 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
import { useGetCaseConfigurationsQuery } from './use_get_case_configurations_query';
import * as api from './api';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { useToasts } from '../../common/lib/kibana';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
diff --git a/x-pack/plugins/cases/public/containers/configure/use_get_supported_action_connectors.tsx.test.tsx b/x-pack/plugins/cases/public/containers/configure/use_get_supported_action_connectors.tsx.test.tsx
index a81d6ac46d18..c9dad2340f2b 100644
--- a/x-pack/plugins/cases/public/containers/configure/use_get_supported_action_connectors.tsx.test.tsx
+++ b/x-pack/plugins/cases/public/containers/configure/use_get_supported_action_connectors.tsx.test.tsx
@@ -6,7 +6,7 @@
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import * as api from './api';
import { noConnectorsCasePermission, TestProviders } from '../../common/mock';
import { useApplicationCapabilities, useToasts } from '../../common/lib/kibana';
@@ -26,15 +26,13 @@ describe('useConnectors', () => {
it('fetches connectors', async () => {
const spy = jest.spyOn(api, 'getSupportedActionConnectors');
- const { waitForNextUpdate } = renderHook(() => useGetSupportedActionConnectors(), {
+ renderHook(() => useGetSupportedActionConnectors(), {
wrapper: ({ children }: React.PropsWithChildren<{}>) => (
{children}
),
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({ signal: expect.any(AbortSignal) });
+ await waitFor(() => expect(spy).toHaveBeenCalledWith({ signal: expect.any(AbortSignal) }));
});
it('shows a toast error when the API returns error', async () => {
@@ -46,45 +44,44 @@ describe('useConnectors', () => {
throw new Error('Something went wrong');
});
- const { waitForNextUpdate } = renderHook(() => useGetSupportedActionConnectors(), {
+ renderHook(() => useGetSupportedActionConnectors(), {
wrapper: ({ children }: React.PropsWithChildren<{}>) => (
{children}
),
});
- await waitForNextUpdate();
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
it('does not fetch connectors when the user does not has access to actions', async () => {
const spyOnFetchConnectors = jest.spyOn(api, 'getSupportedActionConnectors');
useApplicationCapabilitiesMock().actions = { crud: false, read: false };
- const { result, waitForNextUpdate } = renderHook(() => useGetSupportedActionConnectors(), {
+ const { result } = renderHook(() => useGetSupportedActionConnectors(), {
wrapper: ({ children }: React.PropsWithChildren<{}>) => (
{children}
),
});
- await waitForNextUpdate();
-
- expect(spyOnFetchConnectors).not.toHaveBeenCalled();
- expect(result.current.data).toEqual([]);
+ await waitFor(() => {
+ expect(spyOnFetchConnectors).not.toHaveBeenCalled();
+ expect(result.current.data).toEqual([]);
+ });
});
it('does not fetch connectors when the user does not has access to connectors', async () => {
const spyOnFetchConnectors = jest.spyOn(api, 'getSupportedActionConnectors');
useApplicationCapabilitiesMock().actions = { crud: true, read: true };
- const { result, waitForNextUpdate } = renderHook(() => useGetSupportedActionConnectors(), {
+ const { result } = renderHook(() => useGetSupportedActionConnectors(), {
wrapper: ({ children }: React.PropsWithChildren<{}>) => (
{children}
),
});
- await waitForNextUpdate();
-
- expect(spyOnFetchConnectors).not.toHaveBeenCalled();
- expect(result.current.data).toEqual([]);
+ await waitFor(() => {
+ expect(spyOnFetchConnectors).not.toHaveBeenCalled();
+ expect(result.current.data).toEqual([]);
+ });
});
});
diff --git a/x-pack/plugins/cases/public/containers/configure/use_persist_configuration.test.tsx b/x-pack/plugins/cases/public/containers/configure/use_persist_configuration.test.tsx
index 4fab35fd5ce5..04b266478f66 100644
--- a/x-pack/plugins/cases/public/containers/configure/use_persist_configuration.test.tsx
+++ b/x-pack/plugins/cases/public/containers/configure/use_persist_configuration.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { usePersistConfiguration } from './use_persist_configuration';
import * as api from './api';
@@ -55,7 +55,7 @@ describe('usePersistConfiguration', () => {
const spyPost = jest.spyOn(api, 'postCaseConfigure');
const spyPatch = jest.spyOn(api, 'patchCaseConfigure');
- const { waitFor, result } = renderHook(() => usePersistConfiguration(), {
+ const { result } = renderHook(() => usePersistConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
@@ -80,7 +80,7 @@ describe('usePersistConfiguration', () => {
const spyPost = jest.spyOn(api, 'postCaseConfigure');
const spyPatch = jest.spyOn(api, 'patchCaseConfigure');
- const { waitFor, result } = renderHook(() => usePersistConfiguration(), {
+ const { result } = renderHook(() => usePersistConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
@@ -104,7 +104,7 @@ describe('usePersistConfiguration', () => {
it('calls postCaseConfigure with correct data', async () => {
const spyPost = jest.spyOn(api, 'postCaseConfigure');
- const { waitFor, result } = renderHook(() => usePersistConfiguration(), {
+ const { result } = renderHook(() => usePersistConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
@@ -133,7 +133,7 @@ describe('usePersistConfiguration', () => {
const spyPost = jest.spyOn(api, 'postCaseConfigure');
const spyPatch = jest.spyOn(api, 'patchCaseConfigure');
- const { waitFor, result } = renderHook(() => usePersistConfiguration(), {
+ const { result } = renderHook(() => usePersistConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
@@ -157,7 +157,7 @@ describe('usePersistConfiguration', () => {
it('calls patchCaseConfigure with correct data', async () => {
const spyPatch = jest.spyOn(api, 'patchCaseConfigure');
- const { waitFor, result } = renderHook(() => usePersistConfiguration(), {
+ const { result } = renderHook(() => usePersistConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
@@ -184,7 +184,7 @@ describe('usePersistConfiguration', () => {
it('invalidates the queries correctly', async () => {
const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries');
- const { waitFor, result } = renderHook(() => usePersistConfiguration(), {
+ const { result } = renderHook(() => usePersistConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
@@ -198,7 +198,7 @@ describe('usePersistConfiguration', () => {
});
it('shows the success toaster', async () => {
- const { waitFor, result } = renderHook(() => usePersistConfiguration(), {
+ const { result } = renderHook(() => usePersistConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
@@ -216,7 +216,7 @@ describe('usePersistConfiguration', () => {
.spyOn(api, 'postCaseConfigure')
.mockRejectedValue(new Error('useCreateAttachments: Test error'));
- const { waitFor, result } = renderHook(() => usePersistConfiguration(), {
+ const { result } = renderHook(() => usePersistConfiguration(), {
wrapper: appMockRender.AppWrapper,
});
diff --git a/x-pack/plugins/cases/public/containers/use_bulk_update_case.test.tsx b/x-pack/plugins/cases/public/containers/use_bulk_update_case.test.tsx
index 17b4568cc9de..50d28921e1aa 100644
--- a/x-pack/plugins/cases/public/containers/use_bulk_update_case.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_bulk_update_case.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useUpdateCases } from './use_bulk_update_case';
import { allCases } from './mock';
import { useToasts } from '../common/lib/kibana';
@@ -32,7 +32,7 @@ describe('useUpdateCases', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'updateCases');
- const { waitForNextUpdate, result } = renderHook(() => useUpdateCases(), {
+ const { result } = renderHook(() => useUpdateCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -40,14 +40,12 @@ describe('useUpdateCases', () => {
result.current.mutate({ cases: allCases.cases, successToasterTitle: 'Success title' });
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({ cases: allCases.cases });
+ await waitFor(() => expect(spy).toHaveBeenCalledWith({ cases: allCases.cases }));
});
it('invalidates the queries correctly', async () => {
const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries');
- const { waitForNextUpdate, result } = renderHook(() => useUpdateCases(), {
+ const { result } = renderHook(() => useUpdateCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -55,15 +53,15 @@ describe('useUpdateCases', () => {
result.current.mutate({ cases: allCases.cases, successToasterTitle: 'Success title' });
});
- await waitForNextUpdate();
-
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles());
+ await waitFor(() => {
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles());
+ });
});
it('shows a success toaster', async () => {
- const { waitForNextUpdate, result } = renderHook(() => useUpdateCases(), {
+ const { result } = renderHook(() => useUpdateCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -71,18 +69,18 @@ describe('useUpdateCases', () => {
result.current.mutate({ cases: allCases.cases, successToasterTitle: 'Success title' });
});
- await waitForNextUpdate();
-
- expect(addSuccess).toHaveBeenCalledWith({
- title: 'Success title',
- className: 'eui-textBreakWord',
- });
+ await waitFor(() =>
+ expect(addSuccess).toHaveBeenCalledWith({
+ title: 'Success title',
+ className: 'eui-textBreakWord',
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
jest.spyOn(api, 'updateCases').mockRejectedValue(new Error('useUpdateCases: Test error'));
- const { waitForNextUpdate, result } = renderHook(() => useUpdateCases(), {
+ const { result } = renderHook(() => useUpdateCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -90,8 +88,6 @@ describe('useUpdateCases', () => {
result.current.mutate({ cases: allCases.cases, successToasterTitle: 'Success title' });
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx b/x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
index 14d4477df62d..c7aa4b521bcd 100644
--- a/x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { AttachmentType } from '../../common/types/domain';
import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
@@ -58,7 +58,7 @@ describe('useCreateAttachments', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'createAttachments');
- const { waitForNextUpdate, result } = renderHook(() => useCreateAttachments(), {
+ const { result } = renderHook(() => useCreateAttachments(), {
wrapper: appMockRender.AppWrapper,
});
@@ -66,13 +66,16 @@ describe('useCreateAttachments', () => {
result.current.mutate(request);
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({ attachments: attachmentsWithOwner, caseId: request.caseId });
+ await waitFor(() =>
+ expect(spy).toHaveBeenCalledWith({
+ attachments: attachmentsWithOwner,
+ caseId: request.caseId,
+ })
+ );
});
it('does not show a success toaster', async () => {
- const { waitForNextUpdate, result } = renderHook(() => useCreateAttachments(), {
+ const { result } = renderHook(() => useCreateAttachments(), {
wrapper: appMockRender.AppWrapper,
});
@@ -80,9 +83,7 @@ describe('useCreateAttachments', () => {
result.current.mutate(request);
});
- await waitForNextUpdate();
-
- expect(addSuccess).not.toHaveBeenCalled();
+ await waitFor(() => expect(addSuccess).not.toHaveBeenCalled());
});
it('shows a toast error when the api return an error', async () => {
@@ -90,7 +91,7 @@ describe('useCreateAttachments', () => {
.spyOn(api, 'createAttachments')
.mockRejectedValue(new Error('useCreateAttachments: Test error'));
- const { waitForNextUpdate, result } = renderHook(() => useCreateAttachments(), {
+ const { result } = renderHook(() => useCreateAttachments(), {
wrapper: appMockRender.AppWrapper,
});
@@ -98,8 +99,6 @@ describe('useCreateAttachments', () => {
result.current.mutate(request);
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_delete_cases.test.tsx b/x-pack/plugins/cases/public/containers/use_delete_cases.test.tsx
index f0ec4e9a43d8..405351c3f068 100644
--- a/x-pack/plugins/cases/public/containers/use_delete_cases.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_delete_cases.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useDeleteCases } from './use_delete_cases';
import * as api from './api';
@@ -32,7 +32,7 @@ describe('useDeleteCases', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'deleteCases');
- const { waitForNextUpdate, result } = renderHook(() => useDeleteCases(), {
+ const { result } = renderHook(() => useDeleteCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -40,14 +40,12 @@ describe('useDeleteCases', () => {
result.current.mutate({ caseIds: ['1', '2'], successToasterTitle: 'Success title' });
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({ caseIds: ['1', '2'] });
+ await waitFor(() => expect(spy).toHaveBeenCalledWith({ caseIds: ['1', '2'] }));
});
it('invalidates the queries correctly', async () => {
const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries');
- const { waitForNextUpdate, result } = renderHook(() => useDeleteCases(), {
+ const { result } = renderHook(() => useDeleteCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -55,15 +53,15 @@ describe('useDeleteCases', () => {
result.current.mutate({ caseIds: ['1', '2'], successToasterTitle: 'Success title' });
});
- await waitForNextUpdate();
-
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles());
+ await waitFor(() => {
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles());
+ });
});
it('shows a success toaster', async () => {
- const { waitForNextUpdate, result } = renderHook(() => useDeleteCases(), {
+ const { result } = renderHook(() => useDeleteCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -71,18 +69,18 @@ describe('useDeleteCases', () => {
result.current.mutate({ caseIds: ['1', '2'], successToasterTitle: 'Success title' });
});
- await waitForNextUpdate();
-
- expect(addSuccess).toHaveBeenCalledWith({
- title: 'Success title',
- className: 'eui-textBreakWord',
- });
+ await waitFor(() =>
+ expect(addSuccess).toHaveBeenCalledWith({
+ title: 'Success title',
+ className: 'eui-textBreakWord',
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
jest.spyOn(api, 'deleteCases').mockRejectedValue(new Error('useDeleteCases: Test error'));
- const { waitForNextUpdate, result } = renderHook(() => useDeleteCases(), {
+ const { result } = renderHook(() => useDeleteCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -90,8 +88,6 @@ describe('useDeleteCases', () => {
result.current.mutate({ caseIds: ['1', '2'], successToasterTitle: 'Success title' });
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx b/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx
index c185a7394c88..c3d0739cec37 100644
--- a/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useDeleteComment } from './use_delete_comment';
import * as api from './api';
import { basicCaseId } from './mock';
@@ -45,7 +45,7 @@ describe('useDeleteComment', () => {
it('calls deleteComment with correct arguments - case', async () => {
const spyOnDeleteComment = jest.spyOn(api, 'deleteComment');
- const { waitForNextUpdate, result } = renderHook(() => useDeleteComment(), {
+ const { result } = renderHook(() => useDeleteComment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -57,32 +57,16 @@ describe('useDeleteComment', () => {
});
});
- await waitForNextUpdate();
-
- expect(spyOnDeleteComment).toBeCalledWith({
- caseId: basicCaseId,
- commentId,
- });
+ await waitFor(() =>
+ expect(spyOnDeleteComment).toBeCalledWith({
+ caseId: basicCaseId,
+ commentId,
+ })
+ );
});
it('refreshes the case page view after delete', async () => {
- const { waitForNextUpdate, result } = renderHook(() => useDeleteComment(), {
- wrapper: appMockRender.AppWrapper,
- });
-
- result.current.mutate({
- caseId: basicCaseId,
- commentId,
- successToasterTitle,
- });
-
- await waitForNextUpdate();
-
- expect(useRefreshCaseViewPage()).toBeCalled();
- });
-
- it('shows a success toaster correctly', async () => {
- const { waitForNextUpdate, result } = renderHook(() => useDeleteComment(), {
+ const { result } = renderHook(() => useDeleteComment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -94,36 +78,54 @@ describe('useDeleteComment', () => {
});
});
- await waitForNextUpdate();
+ await waitFor(() => expect(useRefreshCaseViewPage()).toBeCalled());
+ });
- expect(addSuccess).toHaveBeenCalledWith({
- title: 'Deleted',
- className: 'eui-textBreakWord',
+ it('shows a success toaster correctly', async () => {
+ const { result } = renderHook(() => useDeleteComment(), {
+ wrapper: appMockRender.AppWrapper,
});
+
+ act(() => {
+ result.current.mutate({
+ caseId: basicCaseId,
+ commentId,
+ successToasterTitle,
+ });
+ });
+
+ await waitFor(() =>
+ expect(addSuccess).toHaveBeenCalledWith({
+ title: 'Deleted',
+ className: 'eui-textBreakWord',
+ })
+ );
});
it('sets isError when fails to delete a case', async () => {
const spyOnDeleteComment = jest.spyOn(api, 'deleteComment');
spyOnDeleteComment.mockRejectedValue(new Error('Error'));
- const { waitForNextUpdate, result } = renderHook(() => useDeleteComment(), {
+ const { result } = renderHook(() => useDeleteComment(), {
wrapper: appMockRender.AppWrapper,
});
- result.current.mutate({
- caseId: basicCaseId,
- commentId,
- successToasterTitle,
+ act(() => {
+ result.current.mutate({
+ caseId: basicCaseId,
+ commentId,
+ successToasterTitle,
+ });
});
- await waitForNextUpdate();
+ await waitFor(() => {
+ expect(spyOnDeleteComment).toBeCalledWith({
+ caseId: basicCaseId,
+ commentId,
+ });
- expect(spyOnDeleteComment).toBeCalledWith({
- caseId: basicCaseId,
- commentId,
+ expect(addError).toHaveBeenCalled();
+ expect(result.current.isError).toBe(true);
});
-
- expect(addError).toHaveBeenCalled();
- expect(result.current.isError).toBe(true);
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_delete_file_attachment.test.tsx b/x-pack/plugins/cases/public/containers/use_delete_file_attachment.test.tsx
index 51382a0f548d..329423e41dfa 100644
--- a/x-pack/plugins/cases/public/containers/use_delete_file_attachment.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_delete_file_attachment.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import * as api from './api';
import { basicCaseId, basicFileMock } from './mock';
import { useRefreshCaseViewPage } from '../components/case_view/use_on_refresh_case_view_page';
@@ -34,7 +34,7 @@ describe('useDeleteFileAttachment', () => {
it('calls deleteFileAttachment with correct arguments - case', async () => {
const spyOnDeleteFileAttachments = jest.spyOn(api, 'deleteFileAttachments');
- const { waitForNextUpdate, result } = renderHook(() => useDeleteFileAttachment(), {
+ const { result } = renderHook(() => useDeleteFileAttachment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -45,16 +45,16 @@ describe('useDeleteFileAttachment', () => {
});
});
- await waitForNextUpdate();
-
- expect(spyOnDeleteFileAttachments).toHaveBeenCalledWith({
- caseId: basicCaseId,
- fileIds: [basicFileMock.id],
- });
+ await waitFor(() =>
+ expect(spyOnDeleteFileAttachments).toHaveBeenCalledWith({
+ caseId: basicCaseId,
+ fileIds: [basicFileMock.id],
+ })
+ );
});
it('refreshes the case page view', async () => {
- const { waitForNextUpdate, result } = renderHook(() => useDeleteFileAttachment(), {
+ const { result } = renderHook(() => useDeleteFileAttachment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -65,13 +65,11 @@ describe('useDeleteFileAttachment', () => {
})
);
- await waitForNextUpdate();
-
- expect(useRefreshCaseViewPage()).toBeCalled();
+ await waitFor(() => expect(useRefreshCaseViewPage()).toBeCalled());
});
it('shows a success toaster correctly', async () => {
- const { waitForNextUpdate, result } = renderHook(() => useDeleteFileAttachment(), {
+ const { result } = renderHook(() => useDeleteFileAttachment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -82,19 +80,19 @@ describe('useDeleteFileAttachment', () => {
})
);
- await waitForNextUpdate();
-
- expect(addSuccess).toHaveBeenCalledWith({
- title: 'File deleted successfully',
- className: 'eui-textBreakWord',
- });
+ await waitFor(() =>
+ expect(addSuccess).toHaveBeenCalledWith({
+ title: 'File deleted successfully',
+ className: 'eui-textBreakWord',
+ })
+ );
});
it('sets isError when fails to delete a file attachment', async () => {
const spyOnDeleteFileAttachments = jest.spyOn(api, 'deleteFileAttachments');
spyOnDeleteFileAttachments.mockRejectedValue(new Error('Error'));
- const { waitForNextUpdate, result } = renderHook(() => useDeleteFileAttachment(), {
+ const { result } = renderHook(() => useDeleteFileAttachment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -105,7 +103,7 @@ describe('useDeleteFileAttachment', () => {
})
);
- await waitForNextUpdate();
+ await waitFor(() => expect(result.current.isError).toBe(true));
expect(spyOnDeleteFileAttachments).toBeCalledWith({
caseId: basicCaseId,
@@ -113,6 +111,5 @@ describe('useDeleteFileAttachment', () => {
});
expect(addError).toHaveBeenCalled();
- expect(result.current.isError).toBe(true);
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_find_case_user_actions.test.tsx b/x-pack/plugins/cases/public/containers/use_find_case_user_actions.test.tsx
index 67110c8ebc0b..7dfaa1ff146e 100644
--- a/x-pack/plugins/cases/public/containers/use_find_case_user_actions.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_find_case_user_actions.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useFindCaseUserActions } from './use_find_case_user_actions';
import type { CaseUserActionTypeWithAll } from '../../common/ui/types';
import { basicCase, findCaseUserActionsResponse } from './mock';
@@ -43,33 +43,32 @@ describe('UseFindCaseUserActions', () => {
});
it('returns proper state on findCaseUserActions', async () => {
- const { result, waitForNextUpdate } = renderHook(
- () => useFindCaseUserActions(basicCase.id, params, isEnabled),
- { wrapper: appMockRender.AppWrapper }
- );
+ const { result } = renderHook(() => useFindCaseUserActions(basicCase.id, params, isEnabled), {
+ wrapper: appMockRender.AppWrapper,
+ });
- await waitForNextUpdate();
-
- expect(result.current).toEqual(
- expect.objectContaining({
- ...initialData,
- data: {
- userActions: [...findCaseUserActionsResponse.userActions],
- total: 30,
- perPage: 10,
- page: 1,
- },
- isError: false,
- isLoading: false,
- isFetching: false,
- })
+ await waitFor(() =>
+ expect(result.current).toEqual(
+ expect.objectContaining({
+ ...initialData,
+ data: {
+ userActions: [...findCaseUserActionsResponse.userActions],
+ total: 30,
+ perPage: 10,
+ page: 1,
+ },
+ isError: false,
+ isLoading: false,
+ isFetching: false,
+ })
+ )
);
});
it('calls the API with correct parameters', async () => {
const spy = jest.spyOn(api, 'findCaseUserActions').mockRejectedValue(initialData);
- const { waitForNextUpdate } = renderHook(
+ renderHook(
() =>
useFindCaseUserActions(
basicCase.id,
@@ -84,12 +83,12 @@ describe('UseFindCaseUserActions', () => {
{ wrapper: appMockRender.AppWrapper }
);
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith(
- basicCase.id,
- { type: 'user', sortOrder: 'desc', page: 1, perPage: 5 },
- expect.any(AbortSignal)
+ await waitFor(() =>
+ expect(spy).toHaveBeenCalledWith(
+ basicCase.id,
+ { type: 'user', sortOrder: 'desc', page: 1, perPage: 5 },
+ expect.any(AbortSignal)
+ )
);
});
@@ -120,20 +119,17 @@ describe('UseFindCaseUserActions', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addError });
- const { waitForNextUpdate } = renderHook(
- () => useFindCaseUserActions(basicCase.id, params, isEnabled),
- {
- wrapper: appMockRender.AppWrapper,
- }
- );
+ renderHook(() => useFindCaseUserActions(basicCase.id, params, isEnabled), {
+ wrapper: appMockRender.AppWrapper,
+ });
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith(
- basicCase.id,
- { type: filterActionType, sortOrder, page: 1, perPage: 10 },
- expect.any(AbortSignal)
- );
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(spy).toHaveBeenCalledWith(
+ basicCase.id,
+ { type: filterActionType, sortOrder, page: 1, perPage: 10 },
+ expect.any(AbortSignal)
+ );
+ expect(addError).toHaveBeenCalled();
+ });
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_action_license.test.tsx b/x-pack/plugins/cases/public/containers/use_get_action_license.test.tsx
index 43e445fa39aa..33cba9ef7123 100644
--- a/x-pack/plugins/cases/public/containers/use_get_action_license.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_action_license.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import * as api from './api';
import { useGetActionLicense } from './use_get_action_license';
import type { AppMockRenderer } from '../common/mock';
@@ -25,12 +25,11 @@ describe('useGetActionLicense', () => {
it('calls getActionLicense with correct arguments', async () => {
const spyOnGetActionLicense = jest.spyOn(api, 'getActionLicense');
- const { waitForNextUpdate } = renderHook(() => useGetActionLicense(), {
+ renderHook(() => useGetActionLicense(), {
wrapper: appMockRenderer.AppWrapper,
});
- await waitForNextUpdate();
- expect(spyOnGetActionLicense).toBeCalledWith(abortCtrl.signal);
+ await waitFor(() => expect(spyOnGetActionLicense).toBeCalledWith(abortCtrl.signal));
});
it('unhappy path', async () => {
@@ -42,11 +41,9 @@ describe('useGetActionLicense', () => {
throw new Error('Something went wrong');
});
- const { waitForNextUpdate } = renderHook(() => useGetActionLicense(), {
+ renderHook(() => useGetActionLicense(), {
wrapper: appMockRenderer.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_case.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case.test.tsx
index 1187c7de07d2..6f693e5d4dc1 100644
--- a/x-pack/plugins/cases/public/containers/use_get_case.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_case.test.tsx
@@ -5,10 +5,9 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
import { useGetCase } from './use_get_case';
import * as api from './api';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import type { FC, PropsWithChildren } from 'react';
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
@@ -32,21 +31,21 @@ const wrapper: FC> = ({ children }) => {
describe.skip('Use get case hook', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'resolveCase');
- const { waitForNextUpdate } = renderHook(() => useGetCase('case-1'), { wrapper });
- await waitForNextUpdate();
- expect(spy).toHaveBeenCalledWith({
- caseId: 'case-1',
- includeComments: true,
- signal: expect.any(AbortSignal),
- });
+ renderHook(() => useGetCase('case-1'), { wrapper });
+ await waitFor(() =>
+ expect(spy).toHaveBeenCalledWith({
+ caseId: 'case-1',
+ includeComments: true,
+ signal: expect.any(AbortSignal),
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addError });
const spy = jest.spyOn(api, 'resolveCase').mockRejectedValue(new Error("C'est la vie"));
- const { waitForNextUpdate } = renderHook(() => useGetCase('case-1'), { wrapper });
- await waitForNextUpdate();
+ renderHook(() => useGetCase('case-1'), { wrapper });
await waitFor(() => {
expect(spy).toHaveBeenCalledWith({
caseId: 'case-1',
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_connectors.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case_connectors.test.tsx
index e73012f83f72..713f8865cd02 100644
--- a/x-pack/plugins/cases/public/containers/use_get_case_connectors.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_case_connectors.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import * as api from './api';
import type { AppMockRenderer } from '../common/mock';
import { createAppMockRenderer } from '../common/mock';
@@ -30,7 +30,7 @@ describe('useGetCaseConnectors', () => {
it('calls getCaseConnectors with correct arguments', async () => {
const spyOnGetCases = jest.spyOn(api, 'getCaseConnectors');
- const { waitFor } = renderHook(() => useGetCaseConnectors(caseId), {
+ renderHook(() => useGetCaseConnectors(caseId), {
wrapper: appMockRender.AppWrapper,
});
@@ -50,7 +50,7 @@ describe('useGetCaseConnectors', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess, addError });
- const { waitFor } = renderHook(() => useGetCaseConnectors(caseId), {
+ renderHook(() => useGetCaseConnectors(caseId), {
wrapper: appMockRender.AppWrapper,
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_file_stats.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case_file_stats.test.tsx
index e7c55cd1fc0c..dbf800577e85 100644
--- a/x-pack/plugins/cases/public/containers/use_get_case_file_stats.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_case_file_stats.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { basicCase } from './mock';
@@ -37,12 +37,12 @@ describe('useGetCaseFileStats', () => {
});
it('calls filesClient.list with correct arguments', async () => {
- const { waitForNextUpdate } = renderHook(() => useGetCaseFileStats(hookParams), {
+ renderHook(() => useGetCaseFileStats(hookParams), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(appMockRender.getFilesClient().list).toHaveBeenCalledWith(expectedCallParams);
+ await waitFor(() =>
+ expect(appMockRender.getFilesClient().list).toHaveBeenCalledWith(expectedCallParams)
+ );
});
it('shows an error toast when filesClient.list throws', async () => {
@@ -53,12 +53,12 @@ describe('useGetCaseFileStats', () => {
throw new Error('Something went wrong');
});
- const { waitForNextUpdate } = renderHook(() => useGetCaseFileStats(hookParams), {
+ renderHook(() => useGetCaseFileStats(hookParams), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(appMockRender.getFilesClient().list).toHaveBeenCalledWith(expectedCallParams);
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(appMockRender.getFilesClient().list).toHaveBeenCalledWith(expectedCallParams);
+ expect(addError).toHaveBeenCalled();
+ });
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_files.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case_files.test.tsx
index 2be8dd605240..c95eaf15aefe 100644
--- a/x-pack/plugins/cases/public/containers/use_get_case_files.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_case_files.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { basicCase } from './mock';
@@ -48,22 +48,22 @@ describe('useGetCaseFiles', () => {
throw new Error('Something went wrong');
});
- const { waitForNextUpdate } = renderHook(() => useGetCaseFiles(hookParams), {
+ renderHook(() => useGetCaseFiles(hookParams), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(appMockRender.getFilesClient().list).toBeCalledWith(expectedCallParams);
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(appMockRender.getFilesClient().list).toBeCalledWith(expectedCallParams);
+ expect(addError).toHaveBeenCalled();
+ });
});
it('calls filesClient.list with correct arguments', async () => {
- const { waitForNextUpdate } = renderHook(() => useGetCaseFiles(hookParams), {
+ renderHook(() => useGetCaseFiles(hookParams), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(appMockRender.getFilesClient().list).toBeCalledWith(expectedCallParams);
+ await waitFor(() =>
+ expect(appMockRender.getFilesClient().list).toBeCalledWith(expectedCallParams)
+ );
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_metrics.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case_metrics.test.tsx
index 3cda384f1c63..0feb032649a6 100644
--- a/x-pack/plugins/cases/public/containers/use_get_case_metrics.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_case_metrics.test.tsx
@@ -7,7 +7,7 @@
import type { FC, PropsWithChildren } from 'react';
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import type { SingleCaseMetricsFeature } from '../../common/ui';
import { useGetCaseMetrics } from './use_get_case_metrics';
import { basicCase } from './mock';
@@ -34,12 +34,13 @@ describe('useGetCaseMetrics', () => {
it('calls getSingleCaseMetrics with correct arguments', async () => {
const spyOnGetCaseMetrics = jest.spyOn(api, 'getSingleCaseMetrics');
- const { waitForNextUpdate } = renderHook(() => useGetCaseMetrics(basicCase.id, features), {
+ renderHook(() => useGetCaseMetrics(basicCase.id, features), {
wrapper,
});
- await waitForNextUpdate();
- expect(spyOnGetCaseMetrics).toBeCalledWith(basicCase.id, features, abortCtrl.signal);
+ await waitFor(() =>
+ expect(spyOnGetCaseMetrics).toBeCalledWith(basicCase.id, features, abortCtrl.signal)
+ );
});
it('shows an error toast when getSingleCaseMetrics throws', async () => {
@@ -51,13 +52,13 @@ describe('useGetCaseMetrics', () => {
throw new Error('Something went wrong');
});
- const { waitForNextUpdate } = renderHook(() => useGetCaseMetrics(basicCase.id, features), {
+ renderHook(() => useGetCaseMetrics(basicCase.id, features), {
wrapper,
});
- await waitForNextUpdate();
-
- expect(spyOnGetCaseMetrics).toBeCalledWith(basicCase.id, features, abortCtrl.signal);
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(spyOnGetCaseMetrics).toBeCalledWith(basicCase.id, features, abortCtrl.signal);
+ expect(addError).toHaveBeenCalled();
+ });
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_user_actions_stats.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case_user_actions_stats.test.tsx
index b81f9d1448aa..bd8ecf7393b2 100644
--- a/x-pack/plugins/cases/public/containers/use_get_case_user_actions_stats.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_case_user_actions_stats.test.tsx
@@ -4,7 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+
+import { waitFor, renderHook } from '@testing-library/react';
import { useToasts } from '../common/lib/kibana';
import type { AppMockRenderer } from '../common/mock';
@@ -31,12 +32,11 @@ describe('useGetCaseUserActionsStats', () => {
});
it('returns proper state on getCaseUserActionsStats', async () => {
- const { result, waitForNextUpdate } = renderHook(
- () => useGetCaseUserActionsStats(basicCase.id),
- { wrapper: appMockRender.AppWrapper }
- );
+ const { result } = renderHook(() => useGetCaseUserActionsStats(basicCase.id), {
+ wrapper: appMockRender.AppWrapper,
+ });
- await waitForNextUpdate();
+ await waitFor(() => expect(result.current.isLoading).toBe(false));
expect(result.current).toEqual(
expect.objectContaining({
@@ -61,25 +61,23 @@ describe('useGetCaseUserActionsStats', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addError });
- const { waitForNextUpdate } = renderHook(() => useGetCaseUserActionsStats(basicCase.id), {
+ renderHook(() => useGetCaseUserActionsStats(basicCase.id), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith(basicCase.id, expect.any(AbortSignal));
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(spy).toHaveBeenCalledWith(basicCase.id, expect.any(AbortSignal));
+ expect(addError).toHaveBeenCalled();
+ });
});
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getCaseUserActionsStats');
- const { waitForNextUpdate } = renderHook(() => useGetCaseUserActionsStats(basicCase.id), {
+ renderHook(() => useGetCaseUserActionsStats(basicCase.id), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith(basicCase.id, expect.any(AbortSignal));
+ await waitFor(() => expect(spy).toHaveBeenCalledWith(basicCase.id, expect.any(AbortSignal)));
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_users.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case_users.test.tsx
index e35e41c3d49f..7f425081989b 100644
--- a/x-pack/plugins/cases/public/containers/use_get_case_users.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_case_users.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useGetCaseUsers } from './use_get_case_users';
import * as api from './api';
import { useToasts } from '../common/lib/kibana';
@@ -26,13 +26,13 @@ describe('useGetCaseUsers', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getCaseUsers');
- const { waitForNextUpdate } = renderHook(() => useGetCaseUsers('case-1'), {
+ renderHook(() => useGetCaseUsers('case-1'), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({ caseId: 'case-1', signal: expect.any(AbortSignal) });
+ await waitFor(() =>
+ expect(spy).toHaveBeenCalledWith({ caseId: 'case-1', signal: expect.any(AbortSignal) })
+ );
});
it('shows a toast error when the api return an error', async () => {
@@ -40,13 +40,13 @@ describe('useGetCaseUsers', () => {
(useToasts as jest.Mock).mockReturnValue({ addError });
const spy = jest.spyOn(api, 'getCaseUsers').mockRejectedValue(new Error("C'est la vie"));
- const { waitForNextUpdate } = renderHook(() => useGetCaseUsers('case-1'), {
+ renderHook(() => useGetCaseUsers('case-1'), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({ caseId: 'case-1', signal: expect.any(AbortSignal) });
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(spy).toHaveBeenCalledWith({ caseId: 'case-1', signal: expect.any(AbortSignal) });
+ expect(addError).toHaveBeenCalled();
+ });
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx b/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
index 92d7abde2f9d..0719c14e9fc4 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { DEFAULT_FILTER_OPTIONS, DEFAULT_QUERY_PARAMS } from './constants';
import { useGetCases } from './use_get_cases';
import * as api from './api';
@@ -31,7 +31,7 @@ describe('useGetCases', () => {
it('calls getCases with correct arguments', async () => {
const spyOnGetCases = jest.spyOn(api, 'getCases');
- const { waitFor } = renderHook(() => useGetCases(), {
+ renderHook(() => useGetCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -55,7 +55,7 @@ describe('useGetCases', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess, addError });
- const { waitFor } = renderHook(() => useGetCases(), {
+ renderHook(() => useGetCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -90,7 +90,7 @@ describe('useGetCases', () => {
};
const spyOnGetCases = jest.spyOn(api, 'getCases');
- const { waitFor } = renderHook(() => useGetCases(), {
+ renderHook(() => useGetCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -109,7 +109,7 @@ describe('useGetCases', () => {
appMockRender = createAppMockRenderer({ owner: [] });
const spyOnGetCases = jest.spyOn(api, 'getCases');
- const { waitFor } = renderHook(() => useGetCases(), {
+ renderHook(() => useGetCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -128,7 +128,7 @@ describe('useGetCases', () => {
appMockRender = createAppMockRenderer({ owner: ['observability'] });
const spyOnGetCases = jest.spyOn(api, 'getCases');
- const { waitFor } = renderHook(() => useGetCases(), {
+ renderHook(() => useGetCases(), {
wrapper: appMockRender.AppWrapper,
});
@@ -147,7 +147,7 @@ describe('useGetCases', () => {
appMockRender = createAppMockRenderer({ owner: ['observability'] });
const spyOnGetCases = jest.spyOn(api, 'getCases');
- const { waitFor } = renderHook(() => useGetCases({ filterOptions: { owner: ['my-owner'] } }), {
+ renderHook(() => useGetCases({ filterOptions: { owner: ['my-owner'] } }), {
wrapper: appMockRender.AppWrapper,
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_cases_metrics.test.tsx b/x-pack/plugins/cases/public/containers/use_get_cases_metrics.test.tsx
index 619e1ea4e1eb..895d41bbfa4c 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases_metrics.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases_metrics.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import * as api from '../api';
import type { AppMockRenderer } from '../common/mock';
import { createAppMockRenderer } from '../common/mock';
@@ -33,17 +33,17 @@ describe('useGetCasesMetrics', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getCasesMetrics');
- const { waitForNextUpdate } = renderHook(() => useGetCasesMetrics(), {
+ renderHook(() => useGetCasesMetrics(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({
- http: expect.anything(),
- signal: abortCtrl.signal,
- query: { owner: [SECURITY_SOLUTION_OWNER], features: [CaseMetricsFeature.MTTR] },
- });
+ await waitFor(() =>
+ expect(spy).toHaveBeenCalledWith({
+ http: expect.anything(),
+ signal: abortCtrl.signal,
+ query: { owner: [SECURITY_SOLUTION_OWNER], features: [CaseMetricsFeature.MTTR] },
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
@@ -51,12 +51,12 @@ describe('useGetCasesMetrics', () => {
.spyOn(api, 'getCasesMetrics')
.mockRejectedValue(new Error('useGetCasesMetrics: Test error'));
- const { waitForNextUpdate } = renderHook(() => useGetCasesMetrics(), {
+ renderHook(() => useGetCasesMetrics(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(addError).toHaveBeenCalled();
+ });
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx b/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx
index fed7159ac15e..e24ac9d1fec4 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useGetCasesStatus } from './use_get_cases_status';
import * as api from '../api';
import type { AppMockRenderer } from '../common/mock';
@@ -32,17 +32,17 @@ describe('useGetCasesMetrics', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'getCasesStatus');
- const { waitForNextUpdate } = renderHook(() => useGetCasesStatus(), {
+ renderHook(() => useGetCasesStatus(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({
- http: expect.anything(),
- signal: abortCtrl.signal,
- query: { owner: [SECURITY_SOLUTION_OWNER] },
- });
+ await waitFor(() =>
+ expect(spy).toHaveBeenCalledWith({
+ http: expect.anything(),
+ signal: abortCtrl.signal,
+ query: { owner: [SECURITY_SOLUTION_OWNER] },
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
@@ -50,12 +50,10 @@ describe('useGetCasesMetrics', () => {
.spyOn(api, 'getCasesStatus')
.mockRejectedValue(new Error('useGetCasesMetrics: Test error'));
- const { waitForNextUpdate } = renderHook(() => useGetCasesStatus(), {
+ renderHook(() => useGetCasesStatus(), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_categories.test.tsx b/x-pack/plugins/cases/public/containers/use_get_categories.test.tsx
index d80f03822ec7..11b242a3072d 100644
--- a/x-pack/plugins/cases/public/containers/use_get_categories.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_categories.test.tsx
@@ -6,7 +6,7 @@
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import * as api from './api';
import { TestProviders } from '../common/mock';
import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
@@ -24,18 +24,18 @@ describe('useGetCategories', () => {
it('calls getCategories api', async () => {
const spyOnGetCategories = jest.spyOn(api, 'getCategories');
- const { waitForNextUpdate } = renderHook(() => useGetCategories(), {
+ renderHook(() => useGetCategories(), {
wrapper: ({ children }: React.PropsWithChildren<{}>) => (
{children}
),
});
- await waitForNextUpdate();
-
- expect(spyOnGetCategories).toBeCalledWith({
- signal: abortCtrl.signal,
- owner: [SECURITY_SOLUTION_OWNER],
- });
+ await waitFor(() =>
+ expect(spyOnGetCategories).toBeCalledWith({
+ signal: abortCtrl.signal,
+ owner: [SECURITY_SOLUTION_OWNER],
+ })
+ );
});
it('displays an error toast when an error occurs', async () => {
@@ -47,14 +47,12 @@ describe('useGetCategories', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addError });
- const { waitForNextUpdate } = renderHook(() => useGetCategories(), {
+ renderHook(() => useGetCategories(), {
wrapper: ({ children }: React.PropsWithChildren<{}>) => (
{children}
),
});
- await waitForNextUpdate();
-
- expect(addError).toBeCalled();
+ await waitFor(() => expect(addError).toBeCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_get_feature_ids.test.tsx b/x-pack/plugins/cases/public/containers/use_get_feature_ids.test.tsx
index 9446007e367d..dee68dff0337 100644
--- a/x-pack/plugins/cases/public/containers/use_get_feature_ids.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_feature_ids.test.tsx
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { useToasts } from '../common/lib/kibana';
import type { AppMockRenderer } from '../common/mock';
import { createAppMockRenderer } from '../common/mock';
@@ -32,12 +31,10 @@ describe('useGetFeaturesIds', () => {
it('returns the features ids correctly', async () => {
const spy = jest.spyOn(api, 'getFeatureIds').mockRejectedValue([]);
- const { waitForNextUpdate } = renderHook(() => useGetFeatureIds(['alert-id-1'], true), {
+ renderHook(() => useGetFeatureIds(['alert-id-1'], true), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
await waitFor(() => {
expect(spy).toHaveBeenCalledWith({
query: {
@@ -67,12 +64,10 @@ describe('useGetFeaturesIds', () => {
.spyOn(api, 'getFeatureIds')
.mockRejectedValue(new Error('Something went wrong'));
- const { waitForNextUpdate } = renderHook(() => useGetFeatureIds(['alert-id-1'], true), {
+ renderHook(() => useGetFeatureIds(['alert-id-1'], true), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
await waitFor(() => {
expect(spy).toHaveBeenCalledWith({
query: {
diff --git a/x-pack/plugins/cases/public/containers/use_get_tags.test.tsx b/x-pack/plugins/cases/public/containers/use_get_tags.test.tsx
index a19074ff279e..315757f065d8 100644
--- a/x-pack/plugins/cases/public/containers/use_get_tags.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_tags.test.tsx
@@ -6,7 +6,7 @@
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import * as api from './api';
import { TestProviders } from '../common/mock';
import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
@@ -24,16 +24,17 @@ describe('useGetTags', () => {
it('calls getTags api', async () => {
const spyOnGetTags = jest.spyOn(api, 'getTags');
- const { waitForNextUpdate } = renderHook(() => useGetTags(), {
+ renderHook(() => useGetTags(), {
wrapper: ({ children }: React.PropsWithChildren<{}>) => (
{children}
),
});
- await waitForNextUpdate();
- expect(spyOnGetTags).toBeCalledWith({
- owner: [SECURITY_SOLUTION_OWNER],
- signal: abortCtrl.signal,
- });
+ await waitFor(() =>
+ expect(spyOnGetTags).toBeCalledWith({
+ owner: [SECURITY_SOLUTION_OWNER],
+ signal: abortCtrl.signal,
+ })
+ );
});
it('displays and error toast when an error occurs', async () => {
@@ -43,12 +44,11 @@ describe('useGetTags', () => {
spyOnGetTags.mockImplementation(() => {
throw new Error('Something went wrong');
});
- const { waitForNextUpdate } = renderHook(() => useGetTags(), {
+ renderHook(() => useGetTags(), {
wrapper: ({ children }: React.PropsWithChildren<{}>) => (
{children}
),
});
- await waitForNextUpdate();
- expect(addError).toBeCalled();
+ await waitFor(() => expect(addError).toBeCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_infinite_find_case_user_actions.test.tsx b/x-pack/plugins/cases/public/containers/use_infinite_find_case_user_actions.test.tsx
index b3df805033ba..19a7f2b9edc3 100644
--- a/x-pack/plugins/cases/public/containers/use_infinite_find_case_user_actions.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_infinite_find_case_user_actions.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useInfiniteFindCaseUserActions } from './use_infinite_find_case_user_actions';
import type { CaseUserActionTypeWithAll } from '../../common/ui/types';
@@ -42,12 +42,12 @@ describe('UseInfiniteFindCaseUserActions', () => {
});
it('returns proper state on findCaseUserActions', async () => {
- const { result, waitForNextUpdate } = renderHook(
+ const { result } = renderHook(
() => useInfiniteFindCaseUserActions(basicCase.id, params, isEnabled),
{ wrapper: appMockRender.AppWrapper }
);
- await waitForNextUpdate();
+ await waitFor(() => expect(result.current.isLoading).toBe(false));
expect(result.current).toEqual(
expect.objectContaining({
@@ -73,7 +73,7 @@ describe('UseInfiniteFindCaseUserActions', () => {
it('calls the API with correct parameters', async () => {
const spy = jest.spyOn(api, 'findCaseUserActions').mockRejectedValue(initialData);
- const { waitForNextUpdate } = renderHook(
+ renderHook(
() =>
useInfiniteFindCaseUserActions(
basicCase.id,
@@ -87,12 +87,12 @@ describe('UseInfiniteFindCaseUserActions', () => {
{ wrapper: appMockRender.AppWrapper }
);
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith(
- basicCase.id,
- { type: 'user', sortOrder: 'desc', page: 1, perPage: 5 },
- expect.any(AbortSignal)
+ await waitFor(() =>
+ expect(spy).toHaveBeenCalledWith(
+ basicCase.id,
+ { type: 'user', sortOrder: 'desc', page: 1, perPage: 5 },
+ expect.any(AbortSignal)
+ )
);
});
@@ -122,33 +122,31 @@ describe('UseInfiniteFindCaseUserActions', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addError });
- const { waitForNextUpdate } = renderHook(
- () => useInfiniteFindCaseUserActions(basicCase.id, params, isEnabled),
- {
- wrapper: appMockRender.AppWrapper,
- }
- );
+ renderHook(() => useInfiniteFindCaseUserActions(basicCase.id, params, isEnabled), {
+ wrapper: appMockRender.AppWrapper,
+ });
- await waitForNextUpdate();
+ await waitFor(() => {
+ expect(spy).toHaveBeenCalledWith(
+ basicCase.id,
+ { type: filterActionType, sortOrder, page: 1, perPage: 10 },
+ expect.any(AbortSignal)
+ );
+ expect(addError).toHaveBeenCalled();
+ });
- expect(spy).toHaveBeenCalledWith(
- basicCase.id,
- { type: filterActionType, sortOrder, page: 1, perPage: 10 },
- expect.any(AbortSignal)
- );
- expect(addError).toHaveBeenCalled();
spy.mockRestore();
});
it('fetches next page with correct params', async () => {
const spy = jest.spyOn(api, 'findCaseUserActions');
- const { result, waitFor } = renderHook(
+ const { result } = renderHook(
() => useInfiniteFindCaseUserActions(basicCase.id, params, isEnabled),
{ wrapper: appMockRender.AppWrapper }
);
- await waitFor(() => result.current.isSuccess);
+ await waitFor(() => expect(result.current.isSuccess).toBe(true));
expect(result.current.data?.pages).toStrictEqual([findCaseUserActionsResponse]);
@@ -165,7 +163,7 @@ describe('UseInfiniteFindCaseUserActions', () => {
expect.any(AbortSignal)
);
});
- await waitFor(() => result.current.data?.pages.length === 2);
+ await waitFor(() => expect(result.current.data?.pages).toHaveLength(2));
});
it('returns hasNextPage correctly', async () => {
diff --git a/x-pack/plugins/cases/public/containers/use_messages_storage.test.tsx b/x-pack/plugins/cases/public/containers/use_messages_storage.test.tsx
index ef4a164e759b..30254f02412f 100644
--- a/x-pack/plugins/cases/public/containers/use_messages_storage.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_messages_storage.test.tsx
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
-import type { UseMessagesStorage } from './use_messages_storage';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useMessagesStorage } from './use_messages_storage';
describe('useMessagesStorage', () => {
@@ -18,35 +17,29 @@ describe('useMessagesStorage', () => {
});
it('should return an empty array when there is no messages', async () => {
+ const { result } = renderHook(() => useMessagesStorage());
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ const { getMessages } = result.current;
await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useMessagesStorage()
- );
- await waitForNextUpdate();
- const { getMessages } = result.current;
expect(getMessages('case')).toEqual([]);
});
});
it('should add a message', async () => {
+ const { result } = renderHook(() => useMessagesStorage());
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ const { getMessages, addMessage } = result.current;
await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useMessagesStorage()
- );
- await waitForNextUpdate();
- const { getMessages, addMessage } = result.current;
addMessage('case', 'id-1');
expect(getMessages('case')).toEqual(['id-1']);
});
});
it('should add multiple messages', async () => {
+ const { result } = renderHook(() => useMessagesStorage());
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ const { getMessages, addMessage } = result.current;
await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useMessagesStorage()
- );
- await waitForNextUpdate();
- const { getMessages, addMessage } = result.current;
addMessage('case', 'id-1');
addMessage('case', 'id-2');
expect(getMessages('case')).toEqual(['id-1', 'id-2']);
@@ -54,12 +47,10 @@ describe('useMessagesStorage', () => {
});
it('should remove a message', async () => {
+ const { result } = renderHook(() => useMessagesStorage());
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ const { getMessages, addMessage, removeMessage } = result.current;
await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useMessagesStorage()
- );
- await waitForNextUpdate();
- const { getMessages, addMessage, removeMessage } = result.current;
addMessage('case', 'id-1');
addMessage('case', 'id-2');
removeMessage('case', 'id-2');
@@ -68,12 +59,10 @@ describe('useMessagesStorage', () => {
});
it('should return presence of a message', async () => {
+ const { result } = renderHook(() => useMessagesStorage());
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ const { hasMessage, addMessage, removeMessage } = result.current;
await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useMessagesStorage()
- );
- await waitForNextUpdate();
- const { hasMessage, addMessage, removeMessage } = result.current;
addMessage('case', 'id-1');
addMessage('case', 'id-2');
removeMessage('case', 'id-2');
@@ -83,16 +72,14 @@ describe('useMessagesStorage', () => {
});
it('should clear all messages', async () => {
+ const { result } = renderHook(() => useMessagesStorage());
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ const { getMessages, addMessage, clearAllMessages } = result.current;
await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useMessagesStorage()
- );
- await waitForNextUpdate();
- const { getMessages, addMessage, clearAllMessages } = result.current;
addMessage('case', 'id-1');
addMessage('case', 'id-2');
clearAllMessages('case');
- expect(getMessages('case')).toEqual([]);
});
+ expect(getMessages('case')).toEqual([]);
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_post_case.test.tsx b/x-pack/plugins/cases/public/containers/use_post_case.test.tsx
index 58a878b32e57..d2c4cb65435c 100644
--- a/x-pack/plugins/cases/public/containers/use_post_case.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_post_case.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import * as api from './api';
import { ConnectorTypes } from '../../common/types/domain';
import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
@@ -49,7 +49,7 @@ describe('usePostCase', () => {
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'postCase');
- const { waitForNextUpdate, result } = renderHook(() => usePostCase(), {
+ const { result } = renderHook(() => usePostCase(), {
wrapper: appMockRender.AppWrapper,
});
@@ -57,14 +57,12 @@ describe('usePostCase', () => {
result.current.mutate({ request: samplePost });
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({ newCase: samplePost });
+ await waitFor(() => expect(spy).toHaveBeenCalledWith({ newCase: samplePost }));
});
it('invalidates the queries correctly', async () => {
const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries');
- const { waitForNextUpdate, result } = renderHook(() => usePostCase(), {
+ const { result } = renderHook(() => usePostCase(), {
wrapper: appMockRender.AppWrapper,
});
@@ -72,15 +70,15 @@ describe('usePostCase', () => {
result.current.mutate({ request: samplePost });
});
- await waitForNextUpdate();
-
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles());
+ await waitFor(() => {
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.casesList());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.userProfiles());
+ });
});
it('does not show a success toaster', async () => {
- const { waitForNextUpdate, result } = renderHook(() => usePostCase(), {
+ const { result } = renderHook(() => usePostCase(), {
wrapper: appMockRender.AppWrapper,
});
@@ -88,15 +86,13 @@ describe('usePostCase', () => {
result.current.mutate({ request: samplePost });
});
- await waitForNextUpdate();
-
- expect(addSuccess).not.toHaveBeenCalled();
+ await waitFor(() => expect(addSuccess).not.toHaveBeenCalled());
});
it('shows a toast error when the api return an error', async () => {
jest.spyOn(api, 'postCase').mockRejectedValue(new Error('usePostCase: Test error'));
- const { waitForNextUpdate, result } = renderHook(() => usePostCase(), {
+ const { result } = renderHook(() => usePostCase(), {
wrapper: appMockRender.AppWrapper,
});
@@ -104,8 +100,6 @@ describe('usePostCase', () => {
result.current.mutate({ request: samplePost });
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_post_push_to_service.test.tsx b/x-pack/plugins/cases/public/containers/use_post_push_to_service.test.tsx
index 1d802b3737c9..0c7a76bc6ff3 100644
--- a/x-pack/plugins/cases/public/containers/use_post_push_to_service.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_post_push_to_service.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useToasts } from '../common/lib/kibana';
import { usePostPushToService } from './use_post_push_to_service';
import { pushedCase } from './mock';
@@ -42,7 +42,7 @@ describe('usePostPushToService', () => {
it('refresh the case after pushing', async () => {
const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries');
- const { waitForNextUpdate, result } = renderHook(() => usePostPushToService(), {
+ const { result } = renderHook(() => usePostPushToService(), {
wrapper: appMockRender.AppWrapper,
});
@@ -50,15 +50,15 @@ describe('usePostPushToService', () => {
result.current.mutate({ caseId, connector });
});
- await waitForNextUpdate();
-
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ await waitFor(() => {
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ });
});
it('calls the api when invoked with the correct parameters', async () => {
const spy = jest.spyOn(api, 'pushCase');
- const { waitForNextUpdate, result } = renderHook(() => usePostPushToService(), {
+ const { result } = renderHook(() => usePostPushToService(), {
wrapper: appMockRender.AppWrapper,
});
@@ -66,13 +66,11 @@ describe('usePostPushToService', () => {
result.current.mutate({ caseId, connector });
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith({ caseId, connectorId: connector.id });
+ await waitFor(() => expect(spy).toHaveBeenCalledWith({ caseId, connectorId: connector.id }));
});
it('shows a success toaster', async () => {
- const { waitForNextUpdate, result } = renderHook(() => usePostPushToService(), {
+ const { result } = renderHook(() => usePostPushToService(), {
wrapper: appMockRender.AppWrapper,
});
@@ -80,18 +78,18 @@ describe('usePostPushToService', () => {
result.current.mutate({ caseId, connector });
});
- await waitForNextUpdate();
-
- expect(addSuccess).toHaveBeenCalledWith({
- title: 'Successfully sent to My connector',
- className: 'eui-textBreakWord',
- });
+ await waitFor(() =>
+ expect(addSuccess).toHaveBeenCalledWith({
+ title: 'Successfully sent to My connector',
+ className: 'eui-textBreakWord',
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
jest.spyOn(api, 'pushCase').mockRejectedValue(new Error('usePostPushToService: Test error'));
- const { waitForNextUpdate, result } = renderHook(() => usePostPushToService(), {
+ const { result } = renderHook(() => usePostPushToService(), {
wrapper: appMockRender.AppWrapper,
});
@@ -99,8 +97,6 @@ describe('usePostPushToService', () => {
result.current.mutate({ caseId, connector });
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_replace_custom_field.test.tsx b/x-pack/plugins/cases/public/containers/use_replace_custom_field.test.tsx
index 366d946af1d9..4b17c874339d 100644
--- a/x-pack/plugins/cases/public/containers/use_replace_custom_field.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_replace_custom_field.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { basicCase } from './mock';
import * as api from './api';
import type { AppMockRenderer } from '../common/mock';
@@ -39,7 +39,7 @@ describe('useReplaceCustomField', () => {
it('replace a customField and refresh the case page', async () => {
const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries');
- const { waitForNextUpdate, result } = renderHook(() => useReplaceCustomField(), {
+ const { result } = renderHook(() => useReplaceCustomField(), {
wrapper: appMockRender.AppWrapper,
});
@@ -47,15 +47,15 @@ describe('useReplaceCustomField', () => {
result.current.mutate(sampleData);
});
- await waitForNextUpdate();
-
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ await waitFor(() => {
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ });
});
it('calls the api when invoked with the correct parameters', async () => {
const patchCustomFieldSpy = jest.spyOn(api, 'replaceCustomField');
- const { waitForNextUpdate, result } = renderHook(() => useReplaceCustomField(), {
+ const { result } = renderHook(() => useReplaceCustomField(), {
wrapper: appMockRender.AppWrapper,
});
@@ -63,16 +63,16 @@ describe('useReplaceCustomField', () => {
result.current.mutate(sampleData);
});
- await waitForNextUpdate();
-
- expect(patchCustomFieldSpy).toHaveBeenCalledWith({
- caseId: sampleData.caseId,
- customFieldId: sampleData.customFieldId,
- request: {
- value: sampleData.customFieldValue,
- caseVersion: sampleData.caseVersion,
- },
- });
+ await waitFor(() =>
+ expect(patchCustomFieldSpy).toHaveBeenCalledWith({
+ caseId: sampleData.caseId,
+ customFieldId: sampleData.customFieldId,
+ request: {
+ value: sampleData.customFieldValue,
+ caseVersion: sampleData.caseVersion,
+ },
+ })
+ );
});
it('calls the api when invoked with the correct parameters of toggle field', async () => {
@@ -83,7 +83,7 @@ describe('useReplaceCustomField', () => {
caseVersion: basicCase.version,
};
const patchCustomFieldSpy = jest.spyOn(api, 'replaceCustomField');
- const { waitForNextUpdate, result } = renderHook(() => useReplaceCustomField(), {
+ const { result } = renderHook(() => useReplaceCustomField(), {
wrapper: appMockRender.AppWrapper,
});
@@ -91,16 +91,16 @@ describe('useReplaceCustomField', () => {
result.current.mutate(newData);
});
- await waitForNextUpdate();
-
- expect(patchCustomFieldSpy).toHaveBeenCalledWith({
- caseId: newData.caseId,
- customFieldId: newData.customFieldId,
- request: {
- value: newData.customFieldValue,
- caseVersion: newData.caseVersion,
- },
- });
+ await waitFor(() =>
+ expect(patchCustomFieldSpy).toHaveBeenCalledWith({
+ caseId: newData.caseId,
+ customFieldId: newData.customFieldId,
+ request: {
+ value: newData.customFieldValue,
+ caseVersion: newData.caseVersion,
+ },
+ })
+ );
});
it('calls the api when invoked with the correct parameters with null value', async () => {
@@ -111,7 +111,7 @@ describe('useReplaceCustomField', () => {
caseVersion: basicCase.version,
};
const patchCustomFieldSpy = jest.spyOn(api, 'replaceCustomField');
- const { waitForNextUpdate, result } = renderHook(() => useReplaceCustomField(), {
+ const { result } = renderHook(() => useReplaceCustomField(), {
wrapper: appMockRender.AppWrapper,
});
@@ -119,16 +119,16 @@ describe('useReplaceCustomField', () => {
result.current.mutate(newData);
});
- await waitForNextUpdate();
-
- expect(patchCustomFieldSpy).toHaveBeenCalledWith({
- caseId: newData.caseId,
- customFieldId: newData.customFieldId,
- request: {
- value: newData.customFieldValue,
- caseVersion: newData.caseVersion,
- },
- });
+ await waitFor(() =>
+ expect(patchCustomFieldSpy).toHaveBeenCalledWith({
+ caseId: newData.caseId,
+ customFieldId: newData.customFieldId,
+ request: {
+ value: newData.customFieldValue,
+ caseVersion: newData.caseVersion,
+ },
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
@@ -136,7 +136,7 @@ describe('useReplaceCustomField', () => {
.spyOn(api, 'replaceCustomField')
.mockRejectedValue(new Error('useUpdateComment: Test error'));
- const { waitForNextUpdate, result } = renderHook(() => useReplaceCustomField(), {
+ const { result } = renderHook(() => useReplaceCustomField(), {
wrapper: appMockRender.AppWrapper,
});
@@ -144,8 +144,6 @@ describe('useReplaceCustomField', () => {
result.current.mutate(sampleData);
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_update_case.test.tsx b/x-pack/plugins/cases/public/containers/use_update_case.test.tsx
index f8d4ff82078c..4b1454446079 100644
--- a/x-pack/plugins/cases/public/containers/use_update_case.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_update_case.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useUpdateCase } from './use_update_case';
import { basicCase } from './mock';
import * as api from './api';
@@ -41,7 +41,7 @@ describe('useUpdateCase', () => {
it('patch case and refresh the case page', async () => {
const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries');
- const { waitForNextUpdate, result } = renderHook(() => useUpdateCase(), {
+ const { result } = renderHook(() => useUpdateCase(), {
wrapper: appMockRender.AppWrapper,
});
@@ -49,15 +49,15 @@ describe('useUpdateCase', () => {
result.current.mutate(sampleUpdate);
});
- await waitForNextUpdate();
-
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ await waitFor(() => {
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ });
});
it('calls the api when invoked with the correct parameters', async () => {
const patchCaseSpy = jest.spyOn(api, 'patchCase');
- const { waitForNextUpdate, result } = renderHook(() => useUpdateCase(), {
+ const { result } = renderHook(() => useUpdateCase(), {
wrapper: appMockRender.AppWrapper,
});
@@ -65,17 +65,17 @@ describe('useUpdateCase', () => {
result.current.mutate(sampleUpdate);
});
- await waitForNextUpdate();
-
- expect(patchCaseSpy).toHaveBeenCalledWith({
- caseId: basicCase.id,
- updatedCase: { description: 'updated description' },
- version: basicCase.version,
- });
+ await waitFor(() =>
+ expect(patchCaseSpy).toHaveBeenCalledWith({
+ caseId: basicCase.id,
+ updatedCase: { description: 'updated description' },
+ version: basicCase.version,
+ })
+ );
});
it('shows a success toaster', async () => {
- const { waitForNextUpdate, result } = renderHook(() => useUpdateCase(), {
+ const { result } = renderHook(() => useUpdateCase(), {
wrapper: appMockRender.AppWrapper,
});
@@ -83,18 +83,18 @@ describe('useUpdateCase', () => {
result.current.mutate(sampleUpdate);
});
- await waitForNextUpdate();
-
- expect(addSuccess).toHaveBeenCalledWith({
- title: 'Updated "Another horrible breach!!"',
- className: 'eui-textBreakWord',
- });
+ await waitFor(() =>
+ expect(addSuccess).toHaveBeenCalledWith({
+ title: 'Updated "Another horrible breach!!"',
+ className: 'eui-textBreakWord',
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
jest.spyOn(api, 'patchCase').mockRejectedValue(new Error('useUpdateCase: Test error'));
- const { waitForNextUpdate, result } = renderHook(() => useUpdateCase(), {
+ const { result } = renderHook(() => useUpdateCase(), {
wrapper: appMockRender.AppWrapper,
});
@@ -102,8 +102,6 @@ describe('useUpdateCase', () => {
result.current.mutate(sampleUpdate);
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/use_update_comment.test.tsx b/x-pack/plugins/cases/public/containers/use_update_comment.test.tsx
index 59c06bd545c8..7a2522d6ac8c 100644
--- a/x-pack/plugins/cases/public/containers/use_update_comment.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_update_comment.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { basicCase } from './mock';
import * as api from './api';
import type { AppMockRenderer } from '../common/mock';
@@ -39,7 +39,7 @@ describe('useUpdateComment', () => {
it('patch case and refresh the case page', async () => {
const queryClientSpy = jest.spyOn(appMockRender.queryClient, 'invalidateQueries');
- const { waitForNextUpdate, result } = renderHook(() => useUpdateComment(), {
+ const { result } = renderHook(() => useUpdateComment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -47,15 +47,15 @@ describe('useUpdateComment', () => {
result.current.mutate(sampleUpdate);
});
- await waitForNextUpdate();
-
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView());
- expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ await waitFor(() => {
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.caseView());
+ expect(queryClientSpy).toHaveBeenCalledWith(casesQueriesKeys.tags());
+ });
});
it('calls the api when invoked with the correct parameters', async () => {
const patchCommentSpy = jest.spyOn(api, 'patchComment');
- const { waitForNextUpdate, result } = renderHook(() => useUpdateComment(), {
+ const { result } = renderHook(() => useUpdateComment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -63,18 +63,18 @@ describe('useUpdateComment', () => {
result.current.mutate(sampleUpdate);
});
- await waitForNextUpdate();
-
- expect(patchCommentSpy).toHaveBeenCalledWith({
- ...sampleUpdate,
- owner: 'securitySolution',
- });
+ await waitFor(() =>
+ expect(patchCommentSpy).toHaveBeenCalledWith({
+ ...sampleUpdate,
+ owner: 'securitySolution',
+ })
+ );
});
it('shows a toast error when the api return an error', async () => {
jest.spyOn(api, 'patchComment').mockRejectedValue(new Error('useUpdateComment: Test error'));
- const { waitForNextUpdate, result } = renderHook(() => useUpdateComment(), {
+ const { result } = renderHook(() => useUpdateComment(), {
wrapper: appMockRender.AppWrapper,
});
@@ -82,8 +82,6 @@ describe('useUpdateComment', () => {
result.current.mutate(sampleUpdate);
});
- await waitForNextUpdate();
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
});
diff --git a/x-pack/plugins/cases/public/containers/user_profiles/use_assignees.test.ts b/x-pack/plugins/cases/public/containers/user_profiles/use_assignees.test.ts
index 3622b66aef00..f808d8d7dd93 100644
--- a/x-pack/plugins/cases/public/containers/user_profiles/use_assignees.test.ts
+++ b/x-pack/plugins/cases/public/containers/user_profiles/use_assignees.test.ts
@@ -6,7 +6,7 @@
*/
import type { UserProfileWithAvatar } from '@kbn/user-profile-components';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { userProfiles, userProfilesMap } from './api.mock';
import { useAssignees } from './use_assignees';
diff --git a/x-pack/plugins/cases/public/containers/user_profiles/use_bulk_get_user_profiles.test.ts b/x-pack/plugins/cases/public/containers/user_profiles/use_bulk_get_user_profiles.test.ts
index 4edc105b8d34..4558c7cdd2d3 100644
--- a/x-pack/plugins/cases/public/containers/user_profiles/use_bulk_get_user_profiles.test.ts
+++ b/x-pack/plugins/cases/public/containers/user_profiles/use_bulk_get_user_profiles.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook, waitFor } from '@testing-library/react';
import { useToasts, useKibana } from '../../common/lib/kibana';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
@@ -41,26 +41,25 @@ describe.skip('useBulkGetUserProfiles', () => {
it('calls bulkGetUserProfiles with correct arguments', async () => {
const spyOnBulkGetUserProfiles = jest.spyOn(api, 'bulkGetUserProfiles');
- const { result, waitFor } = renderHook(() => useBulkGetUserProfiles(props), {
+ renderHook(() => useBulkGetUserProfiles(props), {
wrapper: appMockRender.AppWrapper,
});
- await waitFor(() => result.current.isSuccess);
-
- expect(spyOnBulkGetUserProfiles).toBeCalledWith({
- ...props,
- security: expect.anything(),
- });
+ await waitFor(() =>
+ expect(spyOnBulkGetUserProfiles).toBeCalledWith({
+ ...props,
+ security: expect.anything(),
+ })
+ );
});
it('returns a mapping with user profiles', async () => {
- const { result, waitFor } = renderHook(() => useBulkGetUserProfiles(props), {
+ const { result } = renderHook(() => useBulkGetUserProfiles(props), {
wrapper: appMockRender.AppWrapper,
});
- await waitFor(() => result.current.isSuccess);
-
- expect(result.current.data).toMatchInlineSnapshot(`
+ await waitFor(() =>
+ expect(result.current.data).toMatchInlineSnapshot(`
Map {
"u_J41Oh6L9ki-Vo2tOogS8WRTENzhHurGtRc87NgEAlkc_0" => Object {
"data": Object {},
@@ -93,7 +92,8 @@ describe.skip('useBulkGetUserProfiles', () => {
},
},
}
- `);
+ `)
+ );
});
it('shows a toast error message when an error occurs in the response', async () => {
@@ -106,13 +106,11 @@ describe.skip('useBulkGetUserProfiles', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess, addError });
- const { result, waitFor } = renderHook(() => useBulkGetUserProfiles(props), {
+ renderHook(() => useBulkGetUserProfiles(props), {
wrapper: appMockRender.AppWrapper,
});
- await waitFor(() => result.current.isError);
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => expect(addError).toHaveBeenCalled());
});
it('does not call the bulkGetUserProfiles if the array of uids is empty', async () => {
diff --git a/x-pack/plugins/cases/public/containers/user_profiles/use_get_current_user_profile.test.ts b/x-pack/plugins/cases/public/containers/user_profiles/use_get_current_user_profile.test.ts
index c26a6af82654..918771d5b218 100644
--- a/x-pack/plugins/cases/public/containers/user_profiles/use_get_current_user_profile.test.ts
+++ b/x-pack/plugins/cases/public/containers/user_profiles/use_get_current_user_profile.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useToasts, useKibana } from '../../common/lib/kibana';
import { createStartServicesMock } from '../../common/lib/kibana/kibana_react.mock';
import type { AppMockRenderer } from '../../common/mock';
@@ -36,7 +36,7 @@ describe('useGetCurrentUserProfile', () => {
it('calls getCurrentUserProfile with correct arguments', async () => {
const spyOnGetCurrentUserProfile = jest.spyOn(api, 'getCurrentUserProfile');
- const { waitFor } = renderHook(() => useGetCurrentUserProfile(), {
+ renderHook(() => useGetCurrentUserProfile(), {
wrapper: appMockRender.AppWrapper,
});
@@ -59,7 +59,7 @@ describe('useGetCurrentUserProfile', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess, addError });
- const { waitFor } = renderHook(() => useGetCurrentUserProfile(), {
+ renderHook(() => useGetCurrentUserProfile(), {
wrapper: appMockRender.AppWrapper,
});
@@ -78,7 +78,7 @@ describe('useGetCurrentUserProfile', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess, addError });
- const { waitFor } = renderHook(() => useGetCurrentUserProfile(), {
+ renderHook(() => useGetCurrentUserProfile(), {
wrapper: appMockRender.AppWrapper,
});
diff --git a/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.test.ts b/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.test.ts
index 7daf1d1d5cf6..67907d649464 100644
--- a/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.test.ts
+++ b/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.test.ts
@@ -6,7 +6,7 @@
*/
import { GENERAL_CASES_OWNER } from '../../../common/constants';
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useToasts } from '../../common/lib/kibana';
import type { AppMockRenderer } from '../../common/mock';
import { createAppMockRenderer } from '../../common/mock';
@@ -34,17 +34,18 @@ describe('useSuggestUserProfiles', () => {
it('calls suggestUserProfiles with correct arguments', async () => {
const spyOnSuggestUserProfiles = jest.spyOn(api, 'suggestUserProfiles');
- const { result, waitFor } = renderHook(() => useSuggestUserProfiles(props), {
+ const { result } = renderHook(() => useSuggestUserProfiles(props), {
wrapper: appMockRender.AppWrapper,
});
- await waitFor(() => result.current.isSuccess);
-
- expect(spyOnSuggestUserProfiles).toBeCalledWith({
- ...props,
- size: 10,
- http: expect.anything(),
- signal: expect.anything(),
+ await waitFor(() => {
+ expect(result.current.isSuccess).toBeDefined();
+ expect(spyOnSuggestUserProfiles).toBeCalledWith({
+ ...props,
+ size: 10,
+ http: expect.anything(),
+ signal: expect.anything(),
+ });
});
});
@@ -58,12 +59,13 @@ describe('useSuggestUserProfiles', () => {
const addError = jest.fn();
(useToasts as jest.Mock).mockReturnValue({ addSuccess, addError });
- const { result, waitFor } = renderHook(() => useSuggestUserProfiles(props), {
+ const { result } = renderHook(() => useSuggestUserProfiles(props), {
wrapper: appMockRender.AppWrapper,
});
- await waitFor(() => result.current.isError);
-
- expect(addError).toHaveBeenCalled();
+ await waitFor(() => {
+ expect(result.current.isError).toBeDefined();
+ expect(addError).toHaveBeenCalled();
+ });
});
});
diff --git a/x-pack/plugins/stack_alerts/public/rule_types/es_query/test_query_row/use_test_query.test.ts b/x-pack/plugins/stack_alerts/public/rule_types/es_query/test_query_row/use_test_query.test.ts
index f476d7d896b6..b22c1a81537c 100644
--- a/x-pack/plugins/stack_alerts/public/rule_types/es_query/test_query_row/use_test_query.test.ts
+++ b/x-pack/plugins/stack_alerts/public/rule_types/es_query/test_query_row/use_test_query.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { act } from 'react-test-renderer';
import { useTestQuery } from './use_test_query';
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/email/use_email_config.test.ts b/x-pack/plugins/stack_connectors/public/connector_types/email/use_email_config.test.ts
index ee5ba95bf577..0830b68fc1d5 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/email/use_email_config.test.ts
+++ b/x-pack/plugins/stack_connectors/public/connector_types/email/use_email_config.test.ts
@@ -6,7 +6,7 @@
*/
import { httpServiceMock, notificationServiceMock } from '@kbn/core/public/mocks';
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useEmailConfig } from './use_email_config';
const http = httpServiceMock.createStartContract();
@@ -16,6 +16,12 @@ const renderUseEmailConfigHook = (currentService?: string) =>
renderHook(() => useEmailConfig({ http, toasts }));
describe('useEmailConfig', () => {
+ let res: ReturnType['getEmailServiceConfig']> extends Promise<
+ infer R
+ >
+ ? R
+ : never;
+
beforeEach(() => jest.clearAllMocks());
it('should return the correct result when requesting the config of a service', async () => {
@@ -26,14 +32,16 @@ describe('useEmailConfig', () => {
});
const { result } = renderUseEmailConfigHook();
+
await act(async () => {
- const res = await result.current.getEmailServiceConfig('gmail');
- expect(http.get).toHaveBeenCalledWith('/internal/stack_connectors/_email_config/gmail');
- expect(res).toEqual({
- host: 'smtp.gmail.com',
- port: 465,
- secure: true,
- });
+ res = await result.current.getEmailServiceConfig('gmail');
+ });
+
+ expect(http.get).toHaveBeenCalledWith('/internal/stack_connectors/_email_config/gmail');
+ expect(res).toEqual({
+ host: 'smtp.gmail.com',
+ port: 465,
+ secure: true,
});
});
@@ -44,14 +52,16 @@ describe('useEmailConfig', () => {
});
const { result } = renderUseEmailConfigHook();
+
await act(async () => {
- const res = await result.current.getEmailServiceConfig('gmail');
- expect(http.get).toHaveBeenCalledWith('/internal/stack_connectors/_email_config/gmail');
- expect(res).toEqual({
- host: 'smtp.gmail.com',
- port: 465,
- secure: false,
- });
+ res = await result.current.getEmailServiceConfig('gmail');
+ });
+
+ expect(http.get).toHaveBeenCalledWith('/internal/stack_connectors/_email_config/gmail');
+ expect(res).toEqual({
+ host: 'smtp.gmail.com',
+ port: 465,
+ secure: false,
});
});
@@ -60,13 +70,14 @@ describe('useEmailConfig', () => {
const { result } = renderUseEmailConfigHook();
await act(async () => {
- const res = await result.current.getEmailServiceConfig('foo');
- expect(http.get).toHaveBeenCalledWith('/internal/stack_connectors/_email_config/foo');
- expect(res).toEqual({
- host: '',
- port: 0,
- secure: false,
- });
+ res = await result.current.getEmailServiceConfig('foo');
+ });
+
+ expect(http.get).toHaveBeenCalledWith('/internal/stack_connectors/_email_config/foo');
+ expect(res).toEqual({
+ host: '',
+ port: 0,
+ secure: false,
});
});
@@ -75,13 +86,13 @@ describe('useEmailConfig', () => {
throw new Error('no!');
});
- const { result, waitForNextUpdate } = renderUseEmailConfigHook();
+ const { result } = renderUseEmailConfigHook();
await act(async () => {
result.current.getEmailServiceConfig('foo');
- await waitForNextUpdate();
- expect(toasts.addDanger).toHaveBeenCalled();
});
+
+ await waitFor(() => expect(toasts.addDanger).toHaveBeenCalled());
});
it('should not make an API call if the service is empty', async () => {
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/lib/gen_ai/use_get_dashboard.test.ts b/x-pack/plugins/stack_connectors/public/connector_types/lib/gen_ai/use_get_dashboard.test.ts
index 18bcdc623279..39706e6d22c0 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/lib/gen_ai/use_get_dashboard.test.ts
+++ b/x-pack/plugins/stack_connectors/public/connector_types/lib/gen_ai/use_get_dashboard.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useGetDashboard } from './use_get_dashboard';
import { getDashboard } from './api';
import { useKibana } from '@kbn/triggers-actions-ui-plugin/public';
@@ -58,44 +58,44 @@ describe('useGetDashboard', () => {
])(
'fetches the %p dashboard and sets the dashboard URL with %p',
async (selectedProvider, urlKey) => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useGetDashboard({ ...defaultArgs, selectedProvider })
- );
- await waitForNextUpdate();
- expect(mockDashboard).toHaveBeenCalledWith(
- expect.objectContaining({
- connectorId,
+ const { result } = renderHook(() => useGetDashboard({ ...defaultArgs, selectedProvider }));
+ await waitFor(() => {
+ expect(mockDashboard).toHaveBeenCalledWith(
+ expect.objectContaining({
+ connectorId,
+ dashboardId: `generative-ai-token-usage-${urlKey}-space`,
+ })
+ );
+ expect(mockGetRedirectUrl).toHaveBeenCalledWith({
+ query: {
+ language: 'kuery',
+ query: `kibana.saved_objects: { id : ${connectorId} }`,
+ },
dashboardId: `generative-ai-token-usage-${urlKey}-space`,
- })
- );
- expect(mockGetRedirectUrl).toHaveBeenCalledWith({
- query: {
- language: 'kuery',
- query: `kibana.saved_objects: { id : ${connectorId} }`,
- },
- dashboardId: `generative-ai-token-usage-${urlKey}-space`,
+ });
+ expect(result.current.isLoading).toBe(false);
+ expect(result.current.dashboardUrl).toBe(
+ `http://localhost:5601/app/dashboards#/view/generative-ai-token-usage-${urlKey}-space`
+ );
});
- expect(result.current.isLoading).toBe(false);
- expect(result.current.dashboardUrl).toBe(
- `http://localhost:5601/app/dashboards#/view/generative-ai-token-usage-${urlKey}-space`
- );
}
);
it('handles the case where the dashboard is not available.', async () => {
mockDashboard.mockResolvedValue({ data: { available: false } });
- const { result, waitForNextUpdate } = renderHook(() => useGetDashboard(defaultArgs));
- await waitForNextUpdate();
- expect(mockDashboard).toHaveBeenCalledWith(
- expect.objectContaining({
- connectorId,
- dashboardId: 'generative-ai-token-usage-openai-space',
- })
- );
- expect(mockGetRedirectUrl).not.toHaveBeenCalled();
+ const { result } = renderHook(() => useGetDashboard(defaultArgs));
+ await waitFor(() => {
+ expect(mockDashboard).toHaveBeenCalledWith(
+ expect.objectContaining({
+ connectorId,
+ dashboardId: 'generative-ai-token-usage-openai-space',
+ })
+ );
+ expect(mockGetRedirectUrl).not.toHaveBeenCalled();
- expect(result.current.isLoading).toBe(false);
- expect(result.current.dashboardUrl).toBe(null);
+ expect(result.current.isLoading).toBe(false);
+ expect(result.current.dashboardUrl).toBe(null);
+ });
});
it('handles the case where the spaces API is not available.', async () => {
@@ -111,34 +111,35 @@ describe('useGetDashboard', () => {
});
it('handles the case where connectorId is empty string', async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useGetDashboard({ ...defaultArgs, connectorId: '' })
- );
- await waitForNextUpdate();
- expect(mockDashboard).not.toHaveBeenCalled();
- expect(mockGetRedirectUrl).not.toHaveBeenCalled();
- expect(result.current.isLoading).toBe(false);
- expect(result.current.dashboardUrl).toBe(null);
+ const { result } = renderHook(() => useGetDashboard({ ...defaultArgs, connectorId: '' }));
+ await waitFor(() => {
+ expect(mockDashboard).not.toHaveBeenCalled();
+ expect(mockGetRedirectUrl).not.toHaveBeenCalled();
+ expect(result.current.isLoading).toBe(false);
+ expect(result.current.dashboardUrl).toBe(null);
+ });
});
it('handles the case where the dashboard locator is not available.', async () => {
mockKibana.mockReturnValue({
services: { ...mockServices, dashboard: {} },
});
- const { result, waitForNextUpdate } = renderHook(() => useGetDashboard(defaultArgs));
- await waitForNextUpdate();
- expect(result.current.isLoading).toBe(false);
- expect(result.current.dashboardUrl).toBe(null);
+ const { result } = renderHook(() => useGetDashboard(defaultArgs));
+ await waitFor(() => {
+ expect(result.current.isLoading).toBe(false);
+ expect(result.current.dashboardUrl).toBe(null);
+ });
});
it('correctly handles errors and displays the appropriate toast messages.', async () => {
mockDashboard.mockRejectedValue(new Error('Error fetching dashboard'));
- const { result, waitForNextUpdate } = renderHook(() => useGetDashboard(defaultArgs));
- await waitForNextUpdate();
- expect(result.current.isLoading).toBe(false);
- expect(mockToasts.addDanger).toHaveBeenCalledWith({
- title: 'Error finding OpenAI Token Usage Dashboard.',
- text: 'Error fetching dashboard',
+ const { result } = renderHook(() => useGetDashboard(defaultArgs));
+ await waitFor(() => {
+ expect(result.current.isLoading).toBe(false);
+ expect(mockToasts.addDanger).toHaveBeenCalledWith({
+ title: 'Error finding OpenAI Token Usage Dashboard.',
+ text: 'Error fetching dashboard',
+ });
});
});
});
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_choices.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_choices.test.tsx
index 721897ece726..3033cebd3ccf 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_choices.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_choices.test.tsx
@@ -5,11 +5,11 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '@kbn/triggers-actions-ui-plugin/public';
import { ActionConnector } from '@kbn/triggers-actions-ui-plugin/public/types';
-import { useChoices, UseChoices, UseChoicesProps } from './use_choices';
+import { useChoices } from './use_choices';
import { getChoices } from './api';
jest.mock('./api');
@@ -73,7 +73,7 @@ describe('UseChoices', () => {
const fields = ['category'];
it('init', async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
+ const { result } = renderHook(() =>
useChoices({
http: services.http,
actionConnector,
@@ -82,13 +82,11 @@ describe('UseChoices', () => {
})
);
- await waitForNextUpdate();
-
- expect(result.current).toEqual(useChoicesResponse);
+ await waitFor(() => expect(result.current).toEqual(useChoicesResponse));
});
it('returns an empty array if the field is not in response', async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
+ const { result } = renderHook(() =>
useChoices({
http: services.http,
actionConnector,
@@ -97,16 +95,16 @@ describe('UseChoices', () => {
})
);
- await waitForNextUpdate();
-
- expect(result.current).toEqual({
- isLoading: false,
- choices: { priority: [], category: getChoicesResponse },
- });
+ await waitFor(() =>
+ expect(result.current).toEqual({
+ isLoading: false,
+ choices: { priority: [], category: getChoicesResponse },
+ })
+ );
});
it('returns an empty array when connector is not presented', async () => {
- const { result } = renderHook(() =>
+ const { result } = renderHook(() =>
useChoices({
http: services.http,
actionConnector: undefined,
@@ -127,7 +125,7 @@ describe('UseChoices', () => {
serviceMessage: 'An error occurred',
});
- const { waitForNextUpdate } = renderHook(() =>
+ renderHook(() =>
useChoices({
http: services.http,
actionConnector,
@@ -136,12 +134,12 @@ describe('UseChoices', () => {
})
);
- await waitForNextUpdate();
-
- expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
- text: 'An error occurred',
- title: 'Unable to get choices',
- });
+ await waitFor(() =>
+ expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
+ text: 'An error occurred',
+ title: 'Unable to get choices',
+ })
+ );
});
it('it displays an error when http throws an error', async () => {
@@ -149,7 +147,7 @@ describe('UseChoices', () => {
throw new Error('An error occurred');
});
- renderHook(() =>
+ renderHook(() =>
useChoices({
http: services.http,
actionConnector,
@@ -158,9 +156,11 @@ describe('UseChoices', () => {
})
);
- expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
- text: 'An error occurred',
- title: 'Unable to get choices',
- });
+ await waitFor(() =>
+ expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
+ text: 'An error occurred',
+ title: 'Unable to get choices',
+ })
+ );
});
});
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_app_info.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_app_info.test.tsx
index c8c061c9d07f..c4cf65a59133 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_app_info.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_app_info.test.tsx
@@ -5,9 +5,9 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
-import { useGetAppInfo, UseGetAppInfo, UseGetAppInfoProps } from './use_get_app_info';
+import { useGetAppInfo } from './use_get_app_info';
import { getAppInfo } from './api';
import { ServiceNowActionConnector } from './types';
import { httpServiceMock } from '@kbn/core/public/mocks';
@@ -50,7 +50,7 @@ describe('useGetAppInfo', () => {
});
it('init', async () => {
- const { result } = renderHook(() =>
+ const { result } = renderHook(() =>
useGetAppInfo({
actionTypeId,
http,
@@ -64,7 +64,7 @@ describe('useGetAppInfo', () => {
});
it('returns the application information', async () => {
- const { result } = renderHook(() =>
+ const { result } = renderHook(() =>
useGetAppInfo({
actionTypeId,
http,
@@ -86,7 +86,7 @@ describe('useGetAppInfo', () => {
throw new Error('An error occurred');
});
- const { result } = renderHook(() =>
+ const { result } = renderHook(() =>
useGetAppInfo({
actionTypeId,
http,
@@ -108,7 +108,7 @@ describe('useGetAppInfo', () => {
throw error;
});
- const { result } = renderHook(() =>
+ const { result } = renderHook(() =>
useGetAppInfo({
actionTypeId,
http,
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_choices.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_choices.test.tsx
index 38ea6d55b4e1..fd9808139b8b 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_choices.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_choices.test.tsx
@@ -5,11 +5,11 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '@kbn/triggers-actions-ui-plugin/public';
import { ActionConnector } from '@kbn/triggers-actions-ui-plugin/public/types';
-import { useGetChoices, UseGetChoices, UseGetChoicesProps } from './use_get_choices';
+import { useGetChoices } from './use_get_choices';
import { getChoices } from './api';
jest.mock('./api');
@@ -69,7 +69,7 @@ describe('useGetChoices', () => {
const fields = ['priority'];
it('init', async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
+ const { result } = renderHook(() =>
useGetChoices({
http: services.http,
actionConnector,
@@ -79,16 +79,16 @@ describe('useGetChoices', () => {
})
);
- await waitForNextUpdate();
-
- expect(result.current).toEqual({
- isLoading: false,
- choices: getChoicesResponse,
- });
+ await waitFor(() =>
+ expect(result.current).toEqual({
+ isLoading: false,
+ choices: getChoicesResponse,
+ })
+ );
});
it('returns an empty array when connector is not presented', async () => {
- const { result } = renderHook(() =>
+ const { result } = renderHook(() =>
useGetChoices({
http: services.http,
actionConnector: undefined,
@@ -105,7 +105,7 @@ describe('useGetChoices', () => {
});
it('it calls onSuccess', async () => {
- const { waitForNextUpdate } = renderHook(() =>
+ renderHook(() =>
useGetChoices({
http: services.http,
actionConnector,
@@ -115,9 +115,7 @@ describe('useGetChoices', () => {
})
);
- await waitForNextUpdate();
-
- expect(onSuccess).toHaveBeenCalledWith(getChoicesResponse);
+ await waitFor(() => expect(onSuccess).toHaveBeenCalledWith(getChoicesResponse));
});
it('it displays an error when service fails', async () => {
@@ -126,7 +124,7 @@ describe('useGetChoices', () => {
serviceMessage: 'An error occurred',
});
- const { waitForNextUpdate } = renderHook(() =>
+ renderHook(() =>
useGetChoices({
http: services.http,
actionConnector,
@@ -136,12 +134,12 @@ describe('useGetChoices', () => {
})
);
- await waitForNextUpdate();
-
- expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
- text: 'An error occurred',
- title: 'Unable to get choices',
- });
+ await waitFor(() =>
+ expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
+ text: 'An error occurred',
+ title: 'Unable to get choices',
+ })
+ );
});
it('it displays an error when http throws an error', async () => {
@@ -149,7 +147,7 @@ describe('useGetChoices', () => {
throw new Error('An error occurred');
});
- renderHook(() =>
+ renderHook(() =>
useGetChoices({
http: services.http,
actionConnector,
@@ -159,10 +157,12 @@ describe('useGetChoices', () => {
})
);
- expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
- text: 'An error occurred',
- title: 'Unable to get choices',
- });
+ await waitFor(() =>
+ expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
+ text: 'An error occurred',
+ title: 'Unable to get choices',
+ })
+ );
});
it('returns an empty array if the response is not an array', async () => {
@@ -171,7 +171,7 @@ describe('useGetChoices', () => {
data: {},
});
- const { result } = renderHook(() =>
+ const { result } = renderHook(() =>
useGetChoices({
http: services.http,
actionConnector: undefined,
@@ -181,9 +181,11 @@ describe('useGetChoices', () => {
})
);
- expect(result.current).toEqual({
- isLoading: false,
- choices: [],
+ await waitFor(() => {
+ expect(result.current).toEqual({
+ isLoading: false,
+ choices: [],
+ });
});
});
});
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/swimlane/use_get_application.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/swimlane/use_get_application.test.tsx
index 82e514ec51fd..db33c7aa6801 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/swimlane/use_get_application.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/swimlane/use_get_application.test.tsx
@@ -5,11 +5,11 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '@kbn/triggers-actions-ui-plugin/public/common/lib/kibana';
import { getApplication } from './api';
-import { useGetApplication, UseGetApplication } from './use_get_application';
+import { useGetApplication } from './use_get_application';
jest.mock('./api');
jest.mock('@kbn/triggers-actions-ui-plugin/public/common/lib/kibana');
@@ -43,87 +43,86 @@ describe('useGetApplication', () => {
});
it('init', async () => {
- await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useGetApplication({
- toastNotifications: services.notifications.toasts,
- })
- );
+ const { result } = renderHook(() =>
+ useGetApplication({
+ toastNotifications: services.notifications.toasts,
+ })
+ );
- await waitForNextUpdate();
- expect(result.current).toEqual({
- isLoading: false,
- getApplication: result.current.getApplication,
- });
+ expect(result.current).toEqual({
+ isLoading: false,
+ getApplication: result.current.getApplication,
});
});
it('calls getApplication with correct arguments', async () => {
- await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useGetApplication({
- toastNotifications: services.notifications.toasts,
- })
- );
+ const { result } = renderHook(() =>
+ useGetApplication({
+ toastNotifications: services.notifications.toasts,
+ })
+ );
- await waitForNextUpdate();
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ act(() => {
result.current.getApplication({
appId: action.config.appId,
apiToken: action.secrets.apiToken,
apiUrl: action.config.apiUrl,
});
+ });
- await waitForNextUpdate();
+ await waitFor(() =>
expect(getApplicationMock).toBeCalledWith({
signal: abortCtrl.signal,
appId: action.config.appId,
apiToken: action.secrets.apiToken,
url: action.config.apiUrl,
- });
- });
+ })
+ );
});
it('get application', async () => {
- await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useGetApplication({
- toastNotifications: services.notifications.toasts,
- })
- );
+ const { result } = renderHook(() =>
+ useGetApplication({
+ toastNotifications: services.notifications.toasts,
+ })
+ );
- await waitForNextUpdate();
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ act(() => {
result.current.getApplication({
appId: action.config.appId,
apiToken: action.secrets.apiToken,
apiUrl: action.config.apiUrl,
});
- await waitForNextUpdate();
-
+ });
+ await waitFor(() =>
expect(result.current).toEqual({
isLoading: false,
getApplication: result.current.getApplication,
- });
- });
+ })
+ );
});
it('set isLoading to true when getting the application', async () => {
- await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useGetApplication({
- toastNotifications: services.notifications.toasts,
- })
- );
+ const { result } = renderHook(() =>
+ useGetApplication({
+ toastNotifications: services.notifications.toasts,
+ })
+ );
- await waitForNextUpdate();
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+
+ act(() => {
result.current.getApplication({
appId: action.config.appId,
apiToken: action.secrets.apiToken,
apiUrl: action.config.apiUrl,
});
-
- expect(result.current.isLoading).toBe(true);
});
+
+ expect(result.current.isLoading).toBe(true);
});
it('it displays an error when http throws an error', async () => {
@@ -131,52 +130,52 @@ describe('useGetApplication', () => {
throw new Error('Something went wrong');
});
- await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useGetApplication({
- toastNotifications: services.notifications.toasts,
- })
- );
- await waitForNextUpdate();
+ const { result } = renderHook(() =>
+ useGetApplication({
+ toastNotifications: services.notifications.toasts,
+ })
+ );
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ act(() => {
result.current.getApplication({
appId: action.config.appId,
apiToken: action.secrets.apiToken,
apiUrl: action.config.apiUrl,
});
+ });
- expect(result.current).toEqual({
- isLoading: false,
- getApplication: result.current.getApplication,
- });
+ expect(result.current).toEqual({
+ isLoading: false,
+ getApplication: result.current.getApplication,
+ });
- expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
- title: 'Unable to get application with id bcq16kdTbz5jlwM6h',
- text: 'Something went wrong',
- });
+ expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
+ title: 'Unable to get application with id bcq16kdTbz5jlwM6h',
+ text: 'Something went wrong',
});
});
it('it displays an error when the response does not contain the correct fields', async () => {
getApplicationMock.mockResolvedValue({});
- await act(async () => {
- const { result, waitForNextUpdate } = renderHook(() =>
- useGetApplication({
- toastNotifications: services.notifications.toasts,
- })
- );
- await waitForNextUpdate();
+ const { result } = renderHook(() =>
+ useGetApplication({
+ toastNotifications: services.notifications.toasts,
+ })
+ );
+ await waitFor(() => new Promise((resolve) => resolve(null)));
+ act(() => {
result.current.getApplication({
appId: action.config.appId,
apiToken: action.secrets.apiToken,
apiUrl: action.config.apiUrl,
});
- await waitForNextUpdate();
-
+ });
+ await waitFor(() =>
expect(services.notifications.toasts.addDanger).toHaveBeenCalledWith({
title: 'Unable to get application with id bcq16kdTbz5jlwM6h',
text: 'Unable to get application fields',
- });
- });
+ })
+ );
});
});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx
index 1a5e3f278eb5..845234554314 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_select.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import { useBulkEditSelect } from './use_bulk_edit_select';
import { RuleTableItem } from '../../types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_create_connector.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_create_connector.test.tsx
index 5fe09dd8ae90..f33092c3dea9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_create_connector.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_create_connector.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '../../common/lib/kibana';
import { useCreateConnector } from './use_create_connector';
@@ -29,7 +29,7 @@ describe('useCreateConnector', () => {
});
it('executes correctly', async () => {
- const { result, waitForNextUpdate } = renderHook(() => useCreateConnector());
+ const { result } = renderHook(() => useCreateConnector());
act(() => {
result.current.createConnector({
@@ -40,10 +40,10 @@ describe('useCreateConnector', () => {
});
});
- await waitForNextUpdate();
-
- expect(useKibanaMock().services.http.post).toHaveBeenCalledWith('/api/actions/connector', {
- body: '{"name":"test","config":{},"secrets":{},"connector_type_id":".test"}',
- });
+ await waitFor(() =>
+ expect(useKibanaMock().services.http.post).toHaveBeenCalledWith('/api/actions/connector', {
+ body: '{"name":"test","config":{},"secrets":{},"connector_type_id":".test"}',
+ })
+ );
});
});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_execute_connector.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_execute_connector.test.tsx
index 4b93900ea6b4..a381296e6bc9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_execute_connector.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_execute_connector.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '../../common/lib/kibana';
import { useExecuteConnector } from './use_execute_connector';
@@ -29,17 +29,17 @@ describe('useExecuteConnector', () => {
});
it('executes correctly', async () => {
- const { result, waitForNextUpdate } = renderHook(() => useExecuteConnector());
+ const { result } = renderHook(() => useExecuteConnector());
act(() => {
result.current.executeConnector({ connectorId: 'test-id', params: {} });
});
- await waitForNextUpdate();
-
- expect(useKibanaMock().services.http.post).toHaveBeenCalledWith(
- '/api/actions/connector/test-id/_execute',
- { body: '{"params":{}}' }
+ await waitFor(() =>
+ expect(useKibanaMock().services.http.post).toHaveBeenCalledWith(
+ '/api/actions/connector/test-id/_execute',
+ { body: '{"params":{}}' }
+ )
);
});
});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_get_query_delay_setting.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_get_query_delay_setting.test.tsx
index 4b65e355b9c8..231b9b9be49d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_get_query_delay_setting.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_get_query_delay_setting.test.tsx
@@ -5,8 +5,7 @@
* 2.0.
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { useGetQueryDelaySettings } from './use_get_query_delay_settings';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_license.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_license.test.ts
index 1b2fc7784f4e..ec203e4bdacf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_license.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_license.test.ts
@@ -6,7 +6,7 @@
*/
import { BehaviorSubject } from 'rxjs';
import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { useLicense } from './use_license';
import { useKibana } from '../../common/lib/kibana';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_alert_summary.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_alert_summary.test.ts
index e56c8aa1348b..92c1e3bc5ca6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_alert_summary.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_alert_summary.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
import { ValidFeatureId } from '@kbn/rule-data-utils';
import { useKibana } from '../../common/lib/kibana';
import {
@@ -34,7 +34,7 @@ describe('useLoadAlertSummary', () => {
...mockedAlertSummaryResponse,
});
- const { result, waitForNextUpdate } = renderHook(() =>
+ const { result } = renderHook(() =>
useLoadAlertSummary({
featureIds,
timeRange: mockedAlertSummaryTimeRange,
@@ -49,7 +49,7 @@ describe('useLoadAlertSummary', () => {
},
});
- await waitForNextUpdate();
+ await waitFor(() => new Promise((resolve) => resolve(null)));
const { alertSummary, error } = result.current;
expect(alertSummary).toEqual({
@@ -70,7 +70,7 @@ describe('useLoadAlertSummary', () => {
...mockedAlertSummaryResponse,
});
- const { waitForNextUpdate } = renderHook(() =>
+ renderHook(() =>
useLoadAlertSummary({
featureIds,
timeRange: mockedAlertSummaryTimeRange,
@@ -78,8 +78,6 @@ describe('useLoadAlertSummary', () => {
})
);
- await waitForNextUpdate();
-
const body = JSON.stringify({
fixed_interval: fixedInterval,
gte: utcFrom,
@@ -87,11 +85,14 @@ describe('useLoadAlertSummary', () => {
featureIds,
filter: [filter],
});
- expect(mockedPostAPI).toHaveBeenCalledWith(
- '/internal/rac/alerts/_alert_summary',
- expect.objectContaining({
- body,
- })
+
+ await waitFor(() =>
+ expect(mockedPostAPI).toHaveBeenCalledWith(
+ '/internal/rac/alerts/_alert_summary',
+ expect.objectContaining({
+ body,
+ })
+ )
);
});
@@ -99,15 +100,13 @@ describe('useLoadAlertSummary', () => {
const error = new Error('Fetch Alert Summary Failed');
mockedPostAPI.mockRejectedValueOnce(error);
- const { result, waitForNextUpdate } = renderHook(() =>
+ const { result } = renderHook(() =>
useLoadAlertSummary({
featureIds,
timeRange: mockedAlertSummaryTimeRange,
})
);
- await waitForNextUpdate();
-
- expect(result.current.error).toMatch(error.message);
+ await waitFor(() => expect(result.current.error).toMatch(error.message));
});
});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_aggregations.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_aggregations.test.tsx
index c0e143119f6f..e1cb5f6f4f5e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_aggregations.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rule_aggregations.test.tsx
@@ -5,13 +5,12 @@
* 2.0.
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks/dom';
+import { waitFor, renderHook } from '@testing-library/react';
import { useLoadRuleAggregationsQuery as useLoadRuleAggregations } from './use_load_rule_aggregations_query';
import { RuleStatus } from '../../types';
import { useKibana } from '../../common/lib/kibana';
import { IToasts } from '@kbn/core-notifications-browser';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { waitFor } from '@testing-library/react';
jest.mock('../../common/lib/kibana');
jest.mock('../lib/rule_api/aggregate_kuery_filter', () => ({
@@ -75,7 +74,7 @@ describe('useLoadRuleAggregations', () => {
refresh: undefined,
};
- const { rerender, result, waitForNextUpdate } = renderHook(
+ const { rerender, result } = renderHook(
() => {
return useLoadRuleAggregations(params);
},
@@ -83,20 +82,21 @@ describe('useLoadRuleAggregations', () => {
);
rerender();
- await waitForNextUpdate();
- expect(loadRuleAggregationsWithKueryFilter).toBeCalledWith(
- expect.objectContaining({
- searchText: '',
- typesFilter: [],
- actionTypesFilter: [],
- ruleExecutionStatusesFilter: [],
- ruleLastRunOutcomesFilter: [],
- ruleStatusesFilter: [],
- tagsFilter: [],
- })
- );
- expect(result.current.rulesStatusesTotal).toEqual(MOCK_AGGS.ruleExecutionStatus);
+ await waitFor(() => {
+ expect(loadRuleAggregationsWithKueryFilter).toBeCalledWith(
+ expect.objectContaining({
+ searchText: '',
+ typesFilter: [],
+ actionTypesFilter: [],
+ ruleExecutionStatusesFilter: [],
+ ruleLastRunOutcomesFilter: [],
+ ruleStatusesFilter: [],
+ tagsFilter: [],
+ })
+ );
+ expect(result.current.rulesStatusesTotal).toEqual(MOCK_AGGS.ruleExecutionStatus);
+ });
});
it('should call loadRuleAggregation API with params and handle result', async () => {
@@ -115,28 +115,26 @@ describe('useLoadRuleAggregations', () => {
refresh: undefined,
};
- const { rerender, result, waitForNextUpdate } = renderHook(
- () => useLoadRuleAggregations(params),
- {
- wrapper,
- }
- );
+ const { rerender, result } = renderHook(() => useLoadRuleAggregations(params), {
+ wrapper,
+ });
rerender();
- await waitForNextUpdate();
- expect(loadRuleAggregationsWithKueryFilter).toBeCalledWith(
- expect.objectContaining({
- searchText: 'test',
- typesFilter: ['type1', 'type2'],
- actionTypesFilter: ['action1', 'action2'],
- ruleExecutionStatusesFilter: ['status1', 'status2'],
- ruleStatusesFilter: ['enabled', 'snoozed'] as RuleStatus[],
- tagsFilter: ['tag1', 'tag2'],
- ruleLastRunOutcomesFilter: ['outcome1', 'outcome2'],
- })
- );
- expect(result.current.rulesStatusesTotal).toEqual(MOCK_AGGS.ruleExecutionStatus);
+ await waitFor(() => {
+ expect(loadRuleAggregationsWithKueryFilter).toBeCalledWith(
+ expect.objectContaining({
+ searchText: 'test',
+ typesFilter: ['type1', 'type2'],
+ actionTypesFilter: ['action1', 'action2'],
+ ruleExecutionStatusesFilter: ['status1', 'status2'],
+ ruleStatusesFilter: ['enabled', 'snoozed'] as RuleStatus[],
+ tagsFilter: ['tag1', 'tag2'],
+ ruleLastRunOutcomesFilter: ['outcome1', 'outcome2'],
+ })
+ );
+ expect(result.current.rulesStatusesTotal).toEqual(MOCK_AGGS.ruleExecutionStatus);
+ });
});
it('should call onError if API fails', async () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rules.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rules.test.tsx
index 8cc07c87e241..3c87b04cb62e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rules.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_rules.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks/dom';
+import { waitFor, renderHook } from '@testing-library/react';
import { useLoadRulesQuery as useLoadRules } from './use_load_rules_query';
import {
RuleExecutionStatusErrorReasons,
@@ -15,7 +15,6 @@ import { RuleStatus } from '../../types';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { useKibana } from '../../common/lib/kibana';
import { IToasts } from '@kbn/core-notifications-browser';
-import { waitFor } from '@testing-library/react';
jest.mock('../../common/lib/kibana');
jest.mock('../lib/rule_api/rules_kuery_filter', () => ({
@@ -282,7 +281,7 @@ describe('useLoadRules', () => {
sort: { field: 'name', direction: 'asc' },
};
- const { result, waitForNextUpdate, rerender } = renderHook(() => useLoadRules(params), {
+ const { result, rerender } = renderHook(() => useLoadRules(params), {
wrapper,
});
@@ -291,11 +290,10 @@ describe('useLoadRules', () => {
expect(result.current.rulesState.isLoading).toBeTruthy();
rerender();
- await waitForNextUpdate();
+ await waitFor(() => expect(result.current.rulesState.isLoading).toBeFalsy());
expect(result.current.rulesState.initialLoad).toBeFalsy();
expect(result.current.hasData).toBeTruthy();
- expect(result.current.rulesState.isLoading).toBeFalsy();
expect(onPage).toBeCalledTimes(0);
expect(loadRulesWithKueryFilter).toBeCalledWith(
@@ -339,29 +337,29 @@ describe('useLoadRules', () => {
sort: { field: 'name', direction: 'asc' },
};
- const { waitForNextUpdate, rerender } = renderHook(() => useLoadRules(params), {
+ const { rerender } = renderHook(() => useLoadRules(params), {
wrapper,
});
rerender();
- await waitForNextUpdate();
-
- expect(loadRulesWithKueryFilter).toBeCalledWith(
- expect.objectContaining({
- page: {
- index: 0,
- size: 25,
- },
- searchText: 'test',
- typesFilter: ['type1', 'type2'],
- actionTypesFilter: ['action1', 'action2'],
- ruleExecutionStatusesFilter: ['status1', 'status2'],
- ruleLastRunOutcomesFilter: ['outcome1', 'outcome2'],
- ruleParamsFilter: {},
- ruleStatusesFilter: ['enabled', 'snoozed'],
- tagsFilter: ['tag1', 'tag2'],
- sort: { field: 'name', direction: 'asc' },
- })
+ await waitFor(() =>
+ expect(loadRulesWithKueryFilter).toBeCalledWith(
+ expect.objectContaining({
+ page: {
+ index: 0,
+ size: 25,
+ },
+ searchText: 'test',
+ typesFilter: ['type1', 'type2'],
+ actionTypesFilter: ['action1', 'action2'],
+ ruleExecutionStatusesFilter: ['status1', 'status2'],
+ ruleLastRunOutcomesFilter: ['outcome1', 'outcome2'],
+ ruleParamsFilter: {},
+ ruleStatusesFilter: ['enabled', 'snoozed'],
+ tagsFilter: ['tag1', 'tag2'],
+ sort: { field: 'name', direction: 'asc' },
+ })
+ )
);
});
@@ -391,7 +389,7 @@ describe('useLoadRules', () => {
sort: { field: 'name', direction: 'asc' },
};
- const { rerender, waitForNextUpdate } = renderHook(
+ const { rerender } = renderHook(
() => {
return useLoadRules(params);
},
@@ -399,12 +397,12 @@ describe('useLoadRules', () => {
);
rerender();
- await waitForNextUpdate();
-
- expect(onPage).toHaveBeenCalledWith({
- index: 0,
- size: 25,
- });
+ await waitFor(() =>
+ expect(onPage).toHaveBeenCalledWith({
+ index: 0,
+ size: 25,
+ })
+ );
});
it('should call onError if API fails', async () => {
@@ -459,16 +457,14 @@ describe('useLoadRules', () => {
sort: { field: 'name', direction: 'asc' },
};
- const { rerender, result, waitForNextUpdate } = renderHook(() => useLoadRules(params), {
+ const { rerender, result } = renderHook(() => useLoadRules(params), {
wrapper,
});
expect(result.current.hasData).toBeFalsy();
rerender();
- await waitForNextUpdate();
-
- expect(result.current.hasData).toBeFalsy();
+ await waitFor(() => expect(result.current.hasData).toBeFalsy());
});
it('hasData should be false, if there is rule types filter and no rules with hasDefaultRuleTypesFiltersOn = true', async () => {
@@ -494,16 +490,14 @@ describe('useLoadRules', () => {
hasDefaultRuleTypesFiltersOn: true,
};
- const { rerender, result, waitForNextUpdate } = renderHook(() => useLoadRules(params), {
+ const { rerender, result } = renderHook(() => useLoadRules(params), {
wrapper,
});
expect(result.current.hasData).toBeFalsy();
rerender();
- await waitForNextUpdate();
-
- expect(result.current.hasData).toBeFalsy();
+ await waitFor(() => expect(result.current.hasData).toBeFalsy());
});
});
});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_tags_query.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_tags_query.test.tsx
index 081538d1432e..3aa1bcbf07b2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_tags_query.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_load_tags_query.test.tsx
@@ -5,12 +5,11 @@
* 2.0.
*/
import React from 'react';
-import { renderHook } from '@testing-library/react-hooks/dom';
+import { waitFor, renderHook } from '@testing-library/react';
import { useLoadTagsQuery } from './use_load_tags_query';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { useKibana } from '../../common/lib/kibana';
import { IToasts } from '@kbn/core-notifications-browser';
-import { waitFor } from '@testing-library/react';
const MOCK_TAGS = ['a', 'b', 'c'];
@@ -53,7 +52,7 @@ describe('useLoadTagsQuery', () => {
});
it('should call loadRuleTags API and handle result', async () => {
- const { rerender, result, waitForNextUpdate } = renderHook(
+ const { rerender, result } = renderHook(
() =>
useLoadTagsQuery({
enabled: true,
@@ -67,18 +66,18 @@ describe('useLoadTagsQuery', () => {
);
rerender();
- await waitForNextUpdate();
+ await waitFor(() => {
+ expect(loadRuleTags).toHaveBeenLastCalledWith(
+ expect.objectContaining({
+ search: 'test',
+ perPage: 50,
+ page: 1,
+ })
+ );
- expect(loadRuleTags).toHaveBeenLastCalledWith(
- expect.objectContaining({
- search: 'test',
- perPage: 50,
- page: 1,
- })
- );
-
- expect(result.current.tags).toEqual(MOCK_TAGS);
- expect(result.current.hasNextPage).toEqual(false);
+ expect(result.current.tags).toEqual(MOCK_TAGS);
+ expect(result.current.hasNextPage).toEqual(false);
+ });
});
it('should support pagination', async () => {
@@ -88,7 +87,7 @@ describe('useLoadTagsQuery', () => {
perPage: 5,
total: 10,
});
- const { rerender, result, waitForNextUpdate } = renderHook(
+ const { rerender, result } = renderHook(
() =>
useLoadTagsQuery({
enabled: true,
@@ -101,17 +100,17 @@ describe('useLoadTagsQuery', () => {
);
rerender();
- await waitForNextUpdate();
+ await waitFor(() => {
+ expect(loadRuleTags).toHaveBeenLastCalledWith(
+ expect.objectContaining({
+ perPage: 5,
+ page: 1,
+ })
+ );
- expect(loadRuleTags).toHaveBeenLastCalledWith(
- expect.objectContaining({
- perPage: 5,
- page: 1,
- })
- );
-
- expect(result.current.tags).toEqual(['a', 'b', 'c', 'd', 'e']);
- expect(result.current.hasNextPage).toEqual(true);
+ expect(result.current.tags).toEqual(['a', 'b', 'c', 'd', 'e']);
+ expect(result.current.hasNextPage).toEqual(true);
+ });
loadRuleTags.mockResolvedValue({
data: ['a', 'b', 'c', 'd', 'e'],
@@ -119,6 +118,7 @@ describe('useLoadTagsQuery', () => {
perPage: 5,
total: 10,
});
+
result.current.fetchNextPage();
expect(loadRuleTags).toHaveBeenLastCalledWith(
@@ -129,9 +129,7 @@ describe('useLoadTagsQuery', () => {
);
rerender();
- await waitForNextUpdate();
-
- expect(result.current.hasNextPage).toEqual(false);
+ await waitFor(() => expect(result.current.hasNextPage).toEqual(false));
});
it('should support pagination when there are no tags', async () => {
@@ -142,7 +140,7 @@ describe('useLoadTagsQuery', () => {
total: 0,
});
- const { rerender, result, waitForNextUpdate } = renderHook(
+ const { rerender, result } = renderHook(
() =>
useLoadTagsQuery({
enabled: true,
@@ -155,17 +153,17 @@ describe('useLoadTagsQuery', () => {
);
rerender();
- await waitForNextUpdate();
+ await waitFor(() => {
+ expect(loadRuleTags).toHaveBeenLastCalledWith(
+ expect.objectContaining({
+ perPage: 5,
+ page: 1,
+ })
+ );
- expect(loadRuleTags).toHaveBeenLastCalledWith(
- expect.objectContaining({
- perPage: 5,
- page: 1,
- })
- );
-
- expect(result.current.tags).toEqual([]);
- expect(result.current.hasNextPage).toEqual(false);
+ expect(result.current.tags).toEqual([]);
+ expect(result.current.hasNextPage).toEqual(false);
+ });
});
it('should call onError if API fails', async () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_sub_action.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_sub_action.test.tsx
index 1f2552511de0..161f1564b1dd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_sub_action.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_sub_action.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '../../common/lib/kibana';
import { useSubAction, UseSubActionParams } from './use_sub_action';
@@ -30,102 +30,96 @@ describe('useSubAction', () => {
});
it('init', async () => {
- const { result, waitForNextUpdate } = renderHook(() => useSubAction(params));
- await waitForNextUpdate();
-
- expect(result.current).toEqual({
- isLoading: false,
- response: {},
- error: null,
- });
+ const { result } = renderHook(() => useSubAction(params));
+ await waitFor(() =>
+ expect(result.current).toEqual({
+ isLoading: false,
+ response: {},
+ error: null,
+ })
+ );
});
it('executes the sub action correctly', async () => {
- const { waitForNextUpdate } = renderHook(() => useSubAction(params));
- await waitForNextUpdate();
-
- expect(mockHttpPost).toHaveBeenCalledWith('/api/actions/connector/test-id/_execute', {
- body: '{"params":{"subAction":"test","subActionParams":{"foo":"bar"}}}',
- signal: new AbortController().signal,
- });
+ renderHook(() => useSubAction(params));
+ await waitFor(() =>
+ expect(mockHttpPost).toHaveBeenCalledWith('/api/actions/connector/test-id/_execute', {
+ body: '{"params":{"subAction":"test","subActionParams":{"foo":"bar"}}}',
+ signal: new AbortController().signal,
+ })
+ );
});
it('executes sub action if subAction parameter changes', async () => {
- const { rerender, waitForNextUpdate } = renderHook(useSubAction, { initialProps: params });
- await waitForNextUpdate();
-
- expect(mockHttpPost).toHaveBeenCalledTimes(1);
+ const { rerender } = renderHook(useSubAction, { initialProps: params });
+ await waitFor(() => expect(mockHttpPost).toHaveBeenCalledTimes(1));
await act(async () => {
rerender({ ...params, subAction: 'test-2' });
- await waitForNextUpdate();
});
- expect(mockHttpPost).toHaveBeenCalledTimes(2);
+ await waitFor(() => expect(mockHttpPost).toHaveBeenCalledTimes(2));
});
it('executes sub action if connectorId parameter changes', async () => {
- const { rerender, waitForNextUpdate } = renderHook(useSubAction, { initialProps: params });
- await waitForNextUpdate();
-
- expect(mockHttpPost).toHaveBeenCalledTimes(1);
+ const { rerender } = renderHook(useSubAction, { initialProps: params });
+ await waitFor(() => expect(mockHttpPost).toHaveBeenCalledTimes(1));
await act(async () => {
rerender({ ...params, connectorId: 'test-id-2' });
- await waitForNextUpdate();
});
- expect(mockHttpPost).toHaveBeenCalledTimes(2);
+ await waitFor(() => expect(mockHttpPost).toHaveBeenCalledTimes(2));
});
it('returns memoized response if subActionParams changes but values are equal', async () => {
- const { result, rerender, waitForNextUpdate } = renderHook(useSubAction, {
+ const { result, rerender } = renderHook(useSubAction, {
initialProps: { ...params, subActionParams: { foo: 'bar' } },
});
- await waitForNextUpdate();
+ await waitFor(() => expect(mockHttpPost).toHaveBeenCalledTimes(1));
- expect(mockHttpPost).toHaveBeenCalledTimes(1);
const previous = result.current;
await act(async () => {
rerender({ ...params, subActionParams: { foo: 'bar' } });
- await waitForNextUpdate();
});
- expect(result.current.response).toBe(previous.response);
- expect(mockHttpPost).toHaveBeenCalledTimes(1);
+ await waitFor(() => {
+ expect(result.current.response).toBe(previous.response);
+ expect(mockHttpPost).toHaveBeenCalledTimes(1);
+ });
});
it('executes sub action if subActionParams changes and values are not equal', async () => {
- const { result, rerender, waitForNextUpdate } = renderHook(useSubAction, {
+ const { result, rerender } = renderHook(useSubAction, {
initialProps: { ...params, subActionParams: { foo: 'bar' } },
});
- await waitForNextUpdate();
+ await waitFor(() => expect(mockHttpPost).toHaveBeenCalledTimes(1));
- expect(mockHttpPost).toHaveBeenCalledTimes(1);
const previous = result.current;
await act(async () => {
rerender({ ...params, subActionParams: { foo: 'baz' } });
- await waitForNextUpdate();
});
- expect(result.current.response).not.toBe(previous.response);
- expect(mockHttpPost).toHaveBeenCalledTimes(2);
+ await waitFor(() => {
+ expect(result.current.response).not.toBe(previous.response);
+ expect(mockHttpPost).toHaveBeenCalledTimes(2);
+ });
});
it('returns an error correctly', async () => {
const error = new Error('error executing');
mockHttpPost.mockRejectedValueOnce(error);
- const { result, waitForNextUpdate } = renderHook(() => useSubAction(params));
- await waitForNextUpdate();
-
- expect(result.current).toEqual({
- isLoading: false,
- response: undefined,
- error,
- });
+ const { result } = renderHook(() => useSubAction(params));
+ await waitFor(() =>
+ expect(result.current).toEqual({
+ isLoading: false,
+ response: undefined,
+ error,
+ })
+ );
});
it('should abort on unmount', async () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_update_rules_settings.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_update_rules_settings.test.tsx
index c5f61885addd..e1a04ea929b5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_update_rules_settings.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_update_rules_settings.test.tsx
@@ -6,8 +6,7 @@
*/
import React from 'react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { act, renderHook } from '@testing-library/react-hooks/dom';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook, act } from '@testing-library/react';
import { useUpdateRuleSettings } from './use_update_rules_settings';
const mockAddDanger = jest.fn();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_page/hooks/use_rule_type_ids_by_feature_id.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_page/hooks/use_rule_type_ids_by_feature_id.test.ts
index 3fd8ec70d9ff..03f1f66ede9f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_page/hooks/use_rule_type_ids_by_feature_id.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_page/hooks/use_rule_type_ids_by_feature_id.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks/dom';
+import { renderHook } from '@testing-library/react';
import { useRuleTypeIdsByFeatureId } from './use_rule_type_ids_by_feature_id';
import { ruleTypesIndex } from '../../../mock/rule_types_index';
import { MULTI_CONSUMER_RULE_TYPE_IDS } from '../../../constants';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/cases/use_case_view_navigation.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/cases/use_case_view_navigation.test.ts
index 904a8cae4eec..6b1a14c0f7d2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/cases/use_case_view_navigation.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/cases/use_case_view_navigation.test.ts
@@ -6,7 +6,7 @@
*/
import { BehaviorSubject } from 'rxjs';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '../../../../common/lib/kibana';
import { AppMockRenderer, createAppMockRenderer } from '../../test_utils';
import { useCaseViewNavigation } from './use_case_view_navigation';
@@ -25,8 +25,8 @@ describe('useCaseViewNavigation', () => {
useKibanaMock().services.application.navigateToApp = navigateToApp;
});
- it('calls navigateToApp with correct arguments', () => {
- const { result, waitFor } = renderHook(() => useCaseViewNavigation(), {
+ it('calls navigateToApp with correct arguments', async () => {
+ const { result } = renderHook(() => useCaseViewNavigation(), {
wrapper: appMockRender.AppWrapper,
});
@@ -34,7 +34,7 @@ describe('useCaseViewNavigation', () => {
result.current.navigateToCaseView({ caseId: 'test-id' });
});
- waitFor(() => {
+ await waitFor(() => {
expect(navigateToApp).toHaveBeenCalledWith('testAppId', {
deepLinkId: 'cases',
path: '/test-id',
@@ -42,8 +42,8 @@ describe('useCaseViewNavigation', () => {
});
});
- it('calls navigateToApp with correct arguments and bypass current app id', () => {
- const { result, waitFor } = renderHook(() => useCaseViewNavigation('superAppId'), {
+ it('calls navigateToApp with correct arguments and bypass current app id', async () => {
+ const { result } = renderHook(() => useCaseViewNavigation('superAppId'), {
wrapper: appMockRender.AppWrapper,
});
@@ -51,7 +51,7 @@ describe('useCaseViewNavigation', () => {
result.current.navigateToCaseView({ caseId: 'test-id' });
});
- waitFor(() => {
+ await waitFor(() => {
expect(navigateToApp).toHaveBeenCalledWith('superAppId', {
deepLinkId: 'cases',
path: '/test-id',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_get_muted_alerts.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_get_muted_alerts.test.tsx
index 8d65532c5f10..2718ccd8ca88 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_get_muted_alerts.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_get_muted_alerts.test.tsx
@@ -5,9 +5,8 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
import * as api from '../apis/get_rules_muted_alerts';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '../../../../../common/lib/kibana';
import { AppMockRenderer, createAppMockRenderer } from '../../../test_utils';
import { useGetMutedAlerts } from './use_get_muted_alerts';
@@ -31,12 +30,10 @@ describe('useGetMutedAlerts', () => {
it('calls the api when invoked with the correct parameters', async () => {
const muteAlertInstanceSpy = jest.spyOn(api, 'getMutedAlerts');
- const { waitForNextUpdate } = renderHook(() => useGetMutedAlerts(ruleIds), {
+ renderHook(() => useGetMutedAlerts(ruleIds), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
await waitFor(() => {
expect(muteAlertInstanceSpy).toHaveBeenCalledWith(
expect.anything(),
@@ -53,18 +50,16 @@ describe('useGetMutedAlerts', () => {
wrapper: appMockRender.AppWrapper,
});
- expect(spy).not.toHaveBeenCalled();
+ await waitFor(() => expect(spy).not.toHaveBeenCalled());
});
it('shows a toast error when the api returns an error', async () => {
const spy = jest.spyOn(api, 'getMutedAlerts').mockRejectedValue(new Error('An error'));
- const { waitForNextUpdate } = renderHook(() => useGetMutedAlerts(ruleIds), {
+ renderHook(() => useGetMutedAlerts(ruleIds), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
await waitFor(() => {
expect(spy).toHaveBeenCalled();
expect(addErrorMock).toHaveBeenCalled();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_mute_alert.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_mute_alert.test.tsx
index f7e8b94aa2e6..74d93a0504ca 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_mute_alert.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_mute_alert.test.tsx
@@ -5,9 +5,8 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks/dom';
import * as api from '../../../../lib/rule_api/mute_alert';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '../../../../../common/lib/kibana';
import { AppMockRenderer, createAppMockRenderer } from '../../../test_utils';
import { useMuteAlert } from './use_mute_alert';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_unmute_alert.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_unmute_alert.test.tsx
index d24a481ba30b..178dc5bb6ed9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_unmute_alert.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/alert_mute/use_unmute_alert.test.tsx
@@ -5,9 +5,8 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks/dom';
import * as api from '../../../../lib/rule_api/unmute_alert';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '../../../../../common/lib/kibana';
import { AppMockRenderer, createAppMockRenderer } from '../../../test_utils';
import { useUnmuteAlert } from './use_unmute_alert';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_actions.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_actions.test.tsx
index d84909e746f2..0f136e15156d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_actions.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_actions.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
import { useBulkActions, useBulkAddToCaseActions, useBulkUntrackActions } from './use_bulk_actions';
import { AppMockRenderer, createAppMockRenderer } from '../../test_utils';
import { createCasesServiceMock } from '../index.mock';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_cases.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_cases.test.tsx
index b4598f56c02f..e79955715d4e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_cases.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_cases.test.tsx
@@ -5,9 +5,8 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
import * as api from './apis/bulk_get_cases';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { useKibana } from '../../../../common/lib/kibana';
import { useBulkGetCases } from './use_bulk_get_cases';
import { AppMockRenderer, createAppMockRenderer } from '../../test_utils';
@@ -35,18 +34,18 @@ describe('useBulkGetCases', () => {
const spy = jest.spyOn(api, 'bulkGetCases');
spy.mockResolvedValue(response);
- const { waitForNextUpdate } = renderHook(() => useBulkGetCases(['case-1'], true), {
+ renderHook(() => useBulkGetCases(['case-1'], true), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
- expect(spy).toHaveBeenCalledWith(
- expect.anything(),
- {
- ids: ['case-1'],
- },
- expect.any(AbortSignal)
+ await waitFor(() =>
+ expect(spy).toHaveBeenCalledWith(
+ expect.anything(),
+ {
+ ids: ['case-1'],
+ },
+ expect.any(AbortSignal)
+ )
);
});
@@ -58,18 +57,16 @@ describe('useBulkGetCases', () => {
wrapper: appMockRender.AppWrapper,
});
- expect(spy).not.toHaveBeenCalled();
+ await waitFor(() => expect(spy).not.toHaveBeenCalled());
});
it('shows a toast error when the api return an error', async () => {
const spy = jest.spyOn(api, 'bulkGetCases').mockRejectedValue(new Error('An error'));
- const { waitForNextUpdate } = renderHook(() => useBulkGetCases(['case-1'], true), {
+ renderHook(() => useBulkGetCases(['case-1'], true), {
wrapper: appMockRender.AppWrapper,
});
- await waitForNextUpdate();
-
await waitFor(() => {
expect(spy).toHaveBeenCalledWith(
expect.anything(),
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_maintenance_windows.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_maintenance_windows.test.ts
index b1f8a65e1603..7a2ffd32ad2c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_maintenance_windows.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_maintenance_windows.test.ts
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { renderHook } from '@testing-library/react-hooks';
-import { waitFor } from '@testing-library/react';
+import { waitFor, renderHook } from '@testing-library/react';
import { MaintenanceWindowStatus } from '@kbn/alerting-plugin/common';
import * as api from './apis/bulk_get_maintenance_windows';
import { coreMock } from '@kbn/core/public/mocks';
@@ -96,7 +95,7 @@ describe('useBulkGetMaintenanceWindows', () => {
const spy = jest.spyOn(api, 'bulkGetMaintenanceWindows');
spy.mockResolvedValue(response);
- const { waitForNextUpdate, result } = renderHook(
+ const { result } = renderHook(
() =>
useBulkGetMaintenanceWindows({
ids: ['test-id'],
@@ -107,9 +106,7 @@ describe('useBulkGetMaintenanceWindows', () => {
}
);
- await waitForNextUpdate();
-
- expect(result.current.data?.get('test-id')).toEqual(mockMaintenanceWindow);
+ await waitFor(() => expect(result.current.data?.get('test-id')).toEqual(mockMaintenanceWindow));
expect(spy).toHaveBeenCalledWith({
http: expect.anything(),
@@ -132,7 +129,7 @@ describe('useBulkGetMaintenanceWindows', () => {
}
);
- expect(spy).not.toHaveBeenCalled();
+ await waitFor(() => expect(spy).not.toHaveBeenCalled());
});
it('does not call the api if license is not platinum', async () => {
@@ -152,7 +149,7 @@ describe('useBulkGetMaintenanceWindows', () => {
}
);
- expect(spy).not.toHaveBeenCalled();
+ await waitFor(() => expect(spy).not.toHaveBeenCalled());
});
it('does not call the api if capabilities are not adequate', async () => {
@@ -177,7 +174,7 @@ describe('useBulkGetMaintenanceWindows', () => {
}
);
- expect(spy).not.toHaveBeenCalled();
+ await waitFor(() => expect(spy).not.toHaveBeenCalled());
});
it('shows a toast error when the api return an error', async () => {
@@ -185,7 +182,7 @@ describe('useBulkGetMaintenanceWindows', () => {
.spyOn(api, 'bulkGetMaintenanceWindows')
.mockRejectedValue(new Error('An error'));
- const { waitForNextUpdate } = renderHook(
+ renderHook(
() =>
useBulkGetMaintenanceWindows({
ids: ['test-id'],
@@ -196,8 +193,6 @@ describe('useBulkGetMaintenanceWindows', () => {
}
);
- await waitForNextUpdate();
-
await waitFor(() => {
expect(spy).toHaveBeenCalledWith({
http: expect.anything(),
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.test.tsx
index fb79f87162bc..d6ecf3d9ab20 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.test.tsx
@@ -9,12 +9,12 @@ import React, { FunctionComponent } from 'react';
import { EuiDataGridColumn } from '@elastic/eui';
import { AlertConsumers } from '@kbn/rule-data-utils';
import { Storage } from '@kbn/kibana-utils-plugin/public';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, waitFor, renderHook } from '@testing-library/react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { BrowserFields } from '@kbn/alerting-types';
import { testQueryClientConfig } from '@kbn/alerts-ui-shared/src/common/test_utils/test_query_client_config';
import { fetchAlertsFields } from '@kbn/alerts-ui-shared/src/common/apis/fetch_alerts_fields';
-import { useColumns, UseColumnsArgs, UseColumnsResp } from './use_columns';
+import { useColumns } from './use_columns';
import { AlertsTableStorage } from '../../alerts_table_state';
import { createStartServicesMock } from '../../../../../common/lib/kibana/kibana_react.mock';
import { AlertsQueryContext } from '@kbn/alerts-ui-shared/src/common/contexts/alerts_query_context';
@@ -151,10 +151,7 @@ describe('useColumns', () => {
test('onColumnResize', async () => {
const localDefaultColumns = [...defaultColumns];
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(localDefaultColumns);
- const { result, rerender } = renderHook<
- React.PropsWithChildren,
- UseColumnsResp
- >(
+ const { result, rerender } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -186,7 +183,7 @@ describe('useColumns', () => {
test('check if initial width for the last column does not exist', async () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -211,7 +208,7 @@ describe('useColumns', () => {
const alertsFields = {
testField: { name: 'testField', type: 'string', searchable: true, aggregatable: true },
};
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
alertsFields,
@@ -231,7 +228,7 @@ describe('useColumns', () => {
describe('visibleColumns', () => {
test('hide all columns with onChangeVisibleColumns', async () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -253,7 +250,7 @@ describe('useColumns', () => {
test('show all columns with onChangeVisibleColumns', async () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -282,7 +279,7 @@ describe('useColumns', () => {
test('should populate visibleColumns correctly', async () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -300,10 +297,7 @@ describe('useColumns', () => {
test('should change visibleColumns if provided defaultColumns change', async () => {
let localDefaultColumns = [...defaultColumns];
let localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(localDefaultColumns);
- const { result, rerender } = renderHook<
- React.PropsWithChildren,
- UseColumnsResp
- >(
+ const { result, rerender } = renderHook(
() =>
useColumns({
defaultColumns: localDefaultColumns,
@@ -340,10 +334,7 @@ describe('useColumns', () => {
describe('columns', () => {
test('should changes the column list when defaultColumns has been updated', async () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result, waitFor } = renderHook<
- React.PropsWithChildren,
- UseColumnsResp
- >(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -362,7 +353,7 @@ describe('useColumns', () => {
describe('onToggleColumns', () => {
test('should update the list of columns when on Toggle Columns is called', () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -383,7 +374,7 @@ describe('useColumns', () => {
test('should update the list of visible columns when onToggleColumn is called', async () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -412,7 +403,7 @@ describe('useColumns', () => {
test('should update the column details in the storage when onToggleColumn is called', () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
@@ -445,7 +436,7 @@ describe('useColumns', () => {
describe('onResetColumns', () => {
test('should restore visible columns defaults', () => {
const localStorageAlertsTable = getStorageAlertsTableByDefaultColumns(defaultColumns);
- const { result } = renderHook, UseColumnsResp>(
+ const { result } = renderHook(
() =>
useColumns({
defaultColumns,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.test.ts
index 24bddbe90ec5..b53855f991c5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.test.ts
@@ -5,7 +5,8 @@
* 2.0.
*/
import { usePagination } from './use_pagination';
-import { renderHook, act } from '@testing-library/react-hooks';
+
+import { renderHook, act } from '@testing-library/react';
describe('usePagination', () => {
const onPageChange = jest.fn();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_sorting.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_sorting.test.ts
index 092ec0ed0eb4..95efe7c9c8c5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_sorting.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_sorting.test.ts
@@ -5,7 +5,8 @@
* 2.0.
*/
import { useSorting } from './use_sorting';
-import { renderHook, act } from '@testing-library/react-hooks';
+
+import { renderHook, act } from '@testing-library/react';
describe('useSorting', () => {
const onSortChange = jest.fn();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/hooks/use_rules_list_filter_store.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/hooks/use_rules_list_filter_store.test.tsx
index 89b5e56aa33d..ee2a8637b991 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/hooks/use_rules_list_filter_store.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/hooks/use_rules_list_filter_store.test.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
import * as useLocalStorage from 'react-use/lib/useLocalStorage';
import { useRulesListFilterStore } from './use_rules_list_filter_store';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list_column_selector.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list_column_selector.test.tsx
index ad623631fe85..c3afafd71605 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list_column_selector.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list_column_selector.test.tsx
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { render } from '@testing-library/react';
-import { renderHook } from '@testing-library/react-hooks';
+import { render, renderHook } from '@testing-library/react';
import React from 'react';
import {
RulesListColumns,