Skip to content

Commit 0adbea8

Browse files
[9.1] [Security Solution] Unskip prebuilt rule upgrade ML jobs field test (elastic#232758) (elastic#233639)
# Backport This will backport the following commits from `main` to `9.1`: - [[Security Solution] Unskip prebuilt rule upgrade ML jobs field test (elastic#232758)](elastic#232758) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Maxim Palenov","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-09-01T13:04:57Z","message":"[Security Solution] Unskip prebuilt rule upgrade ML jobs field test (elastic#232758)\n\n**Resolves: https://github.com/elastic/kibana/issues/220081**\n\n## Summary\n\nThis PR unskips skipped earlier Prebuilt Rule Upgrade workflow ML jobs field Jest integration test.\n\n## Details\n\nThe Jest integration test `Upgrade diffable rule \"machine_learning_job_id\" (machine_learning rule type) after preview in flyout customized field w/ an upgrade resulting in a non-solvable conflict (ABC) upgrades rule to resolved value` was skipped earlier in `9.1` and `9.2` due to flakiness. Since that moment combobox integration flakiness has been addressed in the scope of https://github.com/elastic/kibana/pull/228620.\n\nThorough testing in `main` (corresponds to `9.2`) and `9.1` branches hasn't revealed any failures or flakiness. On top of that this test runs in `8.18` and `8.19` smoothly all that time.\n\nTaking the above into account it should be safe to unskip the skipped test. In case if the flakiness pops up we'll have more data to analyze.","sha":"f8992660b97d5e6bc660ac08e241490c63e38764","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["test","release_note:skip","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","Feature:Prebuilt Detection Rules","backport:version","v9.2.0","v9.1.3"],"title":"[Security Solution] Unskip prebuilt rule upgrade ML jobs field test","number":232758,"url":"https://github.com/elastic/kibana/pull/232758","mergeCommit":{"message":"[Security Solution] Unskip prebuilt rule upgrade ML jobs field test (elastic#232758)\n\n**Resolves: https://github.com/elastic/kibana/issues/220081**\n\n## Summary\n\nThis PR unskips skipped earlier Prebuilt Rule Upgrade workflow ML jobs field Jest integration test.\n\n## Details\n\nThe Jest integration test `Upgrade diffable rule \"machine_learning_job_id\" (machine_learning rule type) after preview in flyout customized field w/ an upgrade resulting in a non-solvable conflict (ABC) upgrades rule to resolved value` was skipped earlier in `9.1` and `9.2` due to flakiness. Since that moment combobox integration flakiness has been addressed in the scope of https://github.com/elastic/kibana/pull/228620.\n\nThorough testing in `main` (corresponds to `9.2`) and `9.1` branches hasn't revealed any failures or flakiness. On top of that this test runs in `8.18` and `8.19` smoothly all that time.\n\nTaking the above into account it should be safe to unskip the skipped test. In case if the flakiness pops up we'll have more data to analyze.","sha":"f8992660b97d5e6bc660ac08e241490c63e38764"}},"sourceBranch":"main","suggestedTargetBranches":["9.1"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/232758","number":232758,"mergeCommit":{"message":"[Security Solution] Unskip prebuilt rule upgrade ML jobs field test (elastic#232758)\n\n**Resolves: https://github.com/elastic/kibana/issues/220081**\n\n## Summary\n\nThis PR unskips skipped earlier Prebuilt Rule Upgrade workflow ML jobs field Jest integration test.\n\n## Details\n\nThe Jest integration test `Upgrade diffable rule \"machine_learning_job_id\" (machine_learning rule type) after preview in flyout customized field w/ an upgrade resulting in a non-solvable conflict (ABC) upgrades rule to resolved value` was skipped earlier in `9.1` and `9.2` due to flakiness. Since that moment combobox integration flakiness has been addressed in the scope of https://github.com/elastic/kibana/pull/228620.\n\nThorough testing in `main` (corresponds to `9.2`) and `9.1` branches hasn't revealed any failures or flakiness. On top of that this test runs in `8.18` and `8.19` smoothly all that time.\n\nTaking the above into account it should be safe to unskip the skipped test. In case if the flakiness pops up we'll have more data to analyze.","sha":"f8992660b97d5e6bc660ac08e241490c63e38764"}},{"branch":"9.1","label":"v9.1.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Maxim Palenov <[email protected]>
1 parent 60c74f0 commit 0adbea8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

x-pack/solutions/security/plugins/security_solution/public/common/test/eui/combobox.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ export async function selectEuiComboBoxOption({
5959
fireEvent.click(optionToSelect);
6060
} else {
6161
throw new Error(
62-
`Could not find option with text "${optionText}". Available options: ${options
62+
`Could not find option with text "${optionText}". Available options: [${options
6363
.map((option) => option.textContent)
64-
.join(', ')}`
64+
.join(', ')}]`
6565
);
6666
}
6767
} else {

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/test_utils/assert_rule_upgrade_after_review.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ export function assertRuleUpgradeAfterReview({
257257
});
258258
});
259259

260-
// FLAKY: https://github.com/elastic/kibana/issues/220081
261-
describe.skip('customized field w/ an upgrade resulting in a non-solvable conflict (ABC)', () => {
260+
describe('customized field w/ an upgrade resulting in a non-solvable conflict (ABC)', () => {
262261
it('upgrades rule to suggested value', async () => {
263262
mockRuleUpgradeReviewData({
264263
ruleType,

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/test_utils/set_field_value.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,7 @@ async function inputMachineLearningJobId(
771771
): Promise<void> {
772772
const jobIds = [value].flat();
773773

774+
// Clear currently selected job
774775
await clearEuiComboBoxSelection({
775776
clearButton: within(fieldFinalSide).getByTestId('comboBoxClearButton'),
776777
});

0 commit comments

Comments
 (0)