[ML] Migrate `Enzyme` tests to `RTL` part 2 #226205

rbrtj · 2025-07-02T13:07:24Z

The previous PR - #225423, targeted only direct imports from enzyme. This PR targets all occurrences of helper functions that use Enzyme under the hood.

darnautov · 2025-07-07T07:55:25Z

...ared/ml/public/application/components/annotations/annotation_description_list/index.test.tsx

-    const wrapper = shallowWithIntl(<AnnotationDescriptionList annotation={mockAnnotations[0]} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = renderWithI18n(
+      <AnnotationDescriptionList annotation={mockAnnotations[0] as unknown as Annotation} />


did you try satisfies Annotation for the mock?

Can get rid of as unknown but satisfies is not working properly.
95b9635

darnautov · 2025-07-07T08:02:20Z

...red/ml/public/application/components/annotations/annotations_table/annotations_table.test.js

+};
+
+// Mock withKibana HOC
+jest.mock('@kbn/kibana-react-plugin/public', () => {


I found several createWithKibanaMock in the codebase. I reckon it'd be convenient to create a reusable helper in kibana_react

darnautov · 2025-07-07T08:06:08Z

...tform/plugins/shared/ml/public/application/components/rule_editor/rule_editor_flyout.test.js

-    instance.closeFlyout();
-    test6.wrapper.update();
-    expect(test6.wrapper).toMatchSnapshot();
+  test(`don't render when not opened`, () => {


do we need to keep tests when it's rendered?

To test it we'd need to access component instance through ref. It uses function registration pattern rather than accepting props (isOpen)..
I believe it isn't a good way to test it.
example:

const componentRef = React.createRef(); const { container } = render( <RuleEditorFlyout {...getRequiredProps()} ref={componentRef} /> ); act(() => { componentRef.current.showFlyout({ jobId: 'test-job', detectorIndex: 0, source: { function: 'mean' } }); });

darnautov · 2025-07-07T08:08:09Z

...public/application/components/rule_editor/select_rule_action/add_to_filter_list_link.test.js

-    wrapper.find('EuiLink').simulate('click');
-    wrapper.update();
-    expect(addItemToFilterList).toHaveBeenCalled();
+    fireEvent.click(getByRole('button', { name: 'Add elastic.co to safe_domains' }));


shall we rely on the test id instead?

Updated in d77271e

darnautov · 2025-07-07T08:09:51Z

...ed/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.test.js

+    const { container } = renderWithI18n(<DeleteRuleModal {...requiredProps} />);
+
+    // Find and click the delete link
+    const deleteLink = screen.getByRole('button', { name: 'Delete rule' });


did you consider using a data-test-subj for the buttons?

Updated in d77271e

darnautov · 2025-07-07T08:14:42Z

...shared/ml/public/application/settings/calendars/edit/imported_events/imported_events.test.js

+jest.mock('../../../../capabilities/check_capabilities', () => ({
+  usePermissionCheck: () => [true, true],
+}));


consider using reusable mock from

kibana/x-pack/platform/plugins/shared/ml/public/application/capabilities/__mocks__/check_capabilities.ts

Line 8 in 58b8b47

export const usePermissionCheck = jest.fn((arg: string | string[]) => {

Done in 82c857c

darnautov · 2025-07-07T08:15:52Z

...shared/ml/public/application/settings/calendars/edit/imported_events/imported_events.test.js

+  usePermissionCheck: () => [true, true],
+}));
+
+jest.mock('../../../../contexts/kibana/kibana_context', () => ({


consider extending reusable mock https://github.com/elastic/kibana/blob/f51ac13197c3ee4d106cb97ec07b0ce8f28025e1/x-pack/platform/plugins/shared/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts

The mock wasn't actually needed, removed in 82c857c

darnautov · 2025-07-07T08:16:29Z

...shared/ml/public/application/settings/calendars/edit/new_event_modal/new_event_modal.test.js

-    const addButton = wrapper.find('EuiButton').first();
-    expect(addButton.prop('disabled')).toBe(true);
+    // Find the Add button by its role
+    const addButton = getByRole('button', { name: 'Add' });


it's be safer to use test ids

Updated in d77271e

darnautov

LGTM, left some suggestions

csr

AppEx QA owned changes LGTM

elasticmachine · 2025-07-08T21:27:32Z

💚 Build Succeeded

Buildkite Build
Commit: 2235148

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`ml`	5.4MB	5.4MB	+163.0B

History

cc @rbrtj

kibanamachine · 2025-07-09T07:28:38Z

Starting backport for target branches: 8.19, 9.1

https://github.com/elastic/kibana/actions/runs/16163097447

The previous PR - elastic#225423, targeted only direct imports from `enzyme`. This PR targets all occurrences of helper functions that use Enzyme under the hood. --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit 293bb28)

kibanamachine · 2025-07-09T07:35:18Z

💔 Some backports could not be created

Status	Branch	Result
❌	8.19	Backport failed because of merge conflicts
✅	9.1

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 226205

Questions ?

Please refer to the Backport tool documentation

rbrtj · 2025-07-09T07:49:26Z

💚 All backports created successfully

Status	Branch	Result
✅	8.19

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

The previous PR - elastic#225423, targeted only direct imports from `enzyme`. This PR targets all occurrences of helper functions that use Enzyme under the hood. --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit 293bb28) # Conflicts: # x-pack/platform/plugins/shared/ml/public/application/settings/settings.test.tsx

# Backport This will backport the following commits from `main` to `9.1`: - [[ML] Migrate `Enzyme` tests to `RTL` part 2 (#226205)](#226205)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Robert Jaszczurek <[email protected]>

rbrtj added 30 commits July 1, 2025 17:01

Migrate annotation_description_list

750ec8f

Migrate annotations_table

fa5fbc5

Migrate actions_section

fc03613

Migrate condition_expression

dd7a746

Migrate conditions_section

fb3d59b

Migrate rule_editor_flyout

b335938

Migrate scope_expression

740db0b

Migrate scope_section

97637f2

Migrate detector_description_list

ceaba37

Migrate add_to_filter_list_link

489c183

Migrate delete_rule_modal

59f8ce0

Migrate edit_condition_link

3dac2fb

Migrate explorer_chart_info_tooltip

7677447

Migrate calendar_form

af0ff1e

Migrate events_table

0a88f56

Migrate import_modal && move delete event test to events table

9447000

Migrate calendars header

d33f89b

Migrate new_event_modal

35b6ec4

Migrate imported_events

ccc059d

Migrate calendars list table

9dcbbb6

Migrate add_item_popover

e73d7f3

Migrate delete_filter_list_modal

660419e

Migrate edit_description_popover

1b810bd

Migrate filters list edit header

86670a3

Migrate filters list edit toolbar

e037c5e

Migrate filters list list header

7a42827

Migrate filters list list table

d667d0a

Migrate anomaly_details

a1b40d5

Migrate entity_cell

303a005

Migrate settings

705ab6a

peteharverson requested review from darnautov and removed request for jgowdyelastic July 4, 2025 09:19

Merge branch 'main' into ml-migrate-enzyme-tests-to-rtl-v2

fd544d3

darnautov reviewed Jul 7, 2025

View reviewed changes

darnautov approved these changes Jul 7, 2025

View reviewed changes

rbrtj added 2 commits July 8, 2025 10:02

Simplify type

95b9635

Reusable createWithKibanaMock

d890d55

rbrtj requested review from a team as code owners July 8, 2025 08:46

kibanamachine and others added 6 commits July 8, 2025 08:57

[CI] Auto-commit changed files from 'node scripts/notice'

29d9eb0

Extend createWithKibanaMock with coreMock

d8ad4ff

createWithKibanaMock optional fn argument

e535563

[CI] Auto-commit changed files from 'node scripts/notice'

8c2d91e

Use testIds instead of getByRole

d77271e

Imported_events remove redundant mock

82c857c

csr self-requested a review July 8, 2025 15:30

csr approved these changes Jul 8, 2025

View reviewed changes

rbrtj added 2 commits July 8, 2025 21:40

Revert re-usable helper

9442974

revert tsconfig change

2235148

rbrtj merged commit 293bb28 into elastic:main Jul 9, 2025
12 checks passed

kibanamachine mentioned this pull request Jul 9, 2025

[9.1] [ML] Migrate Enzyme tests to RTL part 2 (#226205) #227172

Merged

rbrtj mentioned this pull request Jul 9, 2025

[8.19] [ML] Migrate Enzyme tests to RTL part 2 (#226205) #227174

Open

kibanamachine mentioned this pull request Jul 9, 2025

[Security assistant] [Attempt 2] Remove title creation step from graph #227138

Merged

[ML] Migrate Enzyme tests to RTL part 2 #226205

[ML] Migrate Enzyme tests to RTL part 2 #226205

Conversation

rbrtj commented Jul 2, 2025 • edited by kibanamachine Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

darnautov left a comment

Choose a reason for hiding this comment

Uh oh!

csr left a comment

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented Jul 8, 2025

💚 Build Succeeded

Metrics [docs]

Async chunks

History

Uh oh!

Uh oh!

kibanamachine commented Jul 9, 2025

Uh oh!

kibanamachine commented Jul 9, 2025

💔 Some backports could not be created

Manual backport

Questions ?

Uh oh!

rbrtj commented Jul 9, 2025

💚 All backports created successfully

Questions ?

Uh oh!

Uh oh!

[ML] Migrate `Enzyme` tests to `RTL` part 2 #226205

[ML] Migrate `Enzyme` tests to `RTL` part 2 #226205

rbrtj commented Jul 2, 2025 •

edited by kibanamachine

Loading