From 0b985cfd8d2c0a44400051dc1632f9a533d32056 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 19:12:22 +0100
Subject: [PATCH] [release-12.1.0] Alerting: Fix flakey test for group loader
 (#108038)

Alerting: Fix flakey test for group loader (#107909)

(cherry picked from commit 889cf5705504f74948e3935ba7112743f153d72f)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 .../group-details/GroupDetailsPage.test.tsx   | 23 ++++++++-----------
 .../components/AlertRuleListItemLoader.tsx    |  1 +
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/public/app/features/alerting/unified/group-details/GroupDetailsPage.test.tsx b/public/app/features/alerting/unified/group-details/GroupDetailsPage.test.tsx
index 6cd31efbe16..90485290325 100644
--- a/public/app/features/alerting/unified/group-details/GroupDetailsPage.test.tsx
+++ b/public/app/features/alerting/unified/group-details/GroupDetailsPage.test.tsx
@@ -2,7 +2,7 @@ import { uniqueId } from 'lodash';
 import { HttpResponse, http } from 'msw';
 import { Route, Routes } from 'react-router-dom-v5-compat';
 import { Props } from 'react-virtualized-auto-sizer';
-import { render, screen, waitFor, waitForElementToBeRemoved, within } from 'test/test-utils';
+import { render, screen, waitFor, within } from 'test/test-utils';
 import { byRole, byTestId } from 'testing-library-selector';
 
 import { setPluginLinksHook } from '@grafana/runtime';
@@ -41,7 +41,6 @@ const ui = {
   header: byRole('heading', { level: 1 }),
   editLink: byRole('link', { name: 'Edit' }),
   exportButton: byRole('button', { name: 'Export' }),
-  ruleLoader: byTestId('alert-rule-list-item-loader'),
   ruleItem: byRole('treeitem'),
   export: {
     dialog: byRole('dialog', { name: /Drawer title Export .* rules/ }),
@@ -161,7 +160,7 @@ describe('GroupDetailsPage', () => {
         '/alerting/grafana/namespaces/test-folder-uid/groups/test-group-cpu/edit?returnTo=%2Falerting%2Fgrafana%2Fnamespaces%2Ftest-folder-uid%2Fgroups%2Ftest-group-cpu%2Fview'
       );
 
-      await waitForElementToBeRemoved(() => ui.ruleLoader.queryAll());
+      expect(await screen.findByRole('treeitem', { name: rule1.grafana_alert.title })).toBeInTheDocument();
 
       const alertRuleItems = await ui.ruleItem.findAll();
       expect(alertRuleItems).toHaveLength(2);
@@ -221,11 +220,9 @@ describe('GroupDetailsPage', () => {
       // Act
       renderGroupDetailsPage('grafana', 'test-folder-uid', group.name);
 
-      // wait for loaders to show and dissapear
-      await waitFor(() => expect(ui.ruleLoader.queryAll()).toHaveLength(3));
-      await waitForElementToBeRemoved(() => ui.ruleLoader.queryAll());
-
-      const alertRuleItems = await ui.ruleItem.findAll();
+      // Wait until rule items are rendered
+      expect(await screen.findByRole('treeitem', { name: rule1.grafana_alert.title })).toBeInTheDocument();
+      const alertRuleItems = ui.ruleItem.getAll();
 
       // Assert
       expect(alertRuleItems).toHaveLength(2);
@@ -238,9 +235,8 @@ describe('GroupDetailsPage', () => {
       // Act
       renderGroupDetailsPage('grafana', 'test-folder-uid', group.name);
 
-      // wait for loaders to show and dissapear
-      await waitFor(() => expect(ui.ruleLoader.queryAll()).toHaveLength(3));
-      await waitForElementToBeRemoved(() => ui.ruleLoader.queryAll());
+      // wait for rule items to render
+      expect(await screen.findByRole('treeitem', { name: rule1.grafana_alert.title })).toBeInTheDocument();
 
       const alertRuleItems = await ui.ruleItem.findAll();
 
@@ -264,9 +260,8 @@ describe('GroupDetailsPage', () => {
 
       // Act
       renderGroupDetailsPage('grafana', 'test-folder-uid', provisionedGroup.name);
-      // wait for loaders to show and dissapear
-      await waitFor(() => expect(ui.ruleLoader.queryAll()).toHaveLength(3));
-      await waitForElementToBeRemoved(() => ui.ruleLoader.queryAll());
+      // wait for rule items to render
+      expect(await screen.findByRole('treeitem', { name: provisionedRule.grafana_alert.title })).toBeInTheDocument();
 
       const alertRuleItems = await ui.ruleItem.findAll();
 
diff --git a/public/app/features/alerting/unified/rule-list/components/AlertRuleListItemLoader.tsx b/public/app/features/alerting/unified/rule-list/components/AlertRuleListItemLoader.tsx
index db56bb9af9f..e8abce41ed8 100644
--- a/public/app/features/alerting/unified/rule-list/components/AlertRuleListItemLoader.tsx
+++ b/public/app/features/alerting/unified/rule-list/components/AlertRuleListItemLoader.tsx
@@ -17,6 +17,7 @@ export function AlertRuleListItemSkeleton() {
       description={<Skeleton width={256} />}
       actions={<RuleActionsSkeleton />}
       data-testid="alert-rule-list-item-loader"
+      aria-disabled={true}
     />
   );
 }