From f2795981c6b8f6bc84e45fdf00f5c560aaae04c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 10 Feb 2022 12:23:56 +0100
Subject: [PATCH] Prometheus: Fix test warnings (#45206)

---
 .../ButtonCascader/ButtonCascader.tsx          |  2 +-
 .../components/PromQueryBuilder.test.tsx       | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
index 0349f93c989..a57f85d85ad 100644
--- a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
+++ b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.tsx
@@ -59,7 +59,7 @@ export const ButtonCascader: React.FC<ButtonCascaderProps> = (props) => {
     <RCCascader
       onChange={onChangeCascader(onChange)}
       loadData={onLoadDataCascader(loadData)}
-      popupClassName={styles.popup}
+      dropdownClassName={styles.popup}
       {...rest}
       expandIcon={null}
     >
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
index 022c7fab92e..d477c475d24 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen, getByText } from '@testing-library/react';
+import { render, screen, getByText, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { PromQueryBuilder } from './PromQueryBuilder';
 import { PrometheusDatasource } from '../../datasource';
@@ -70,7 +70,7 @@ describe('PromQueryBuilder', () => {
   it('tries to load metrics without labels', async () => {
     const { languageProvider, container } = setup();
     openMetricSelect(container);
-    expect(languageProvider.getLabelValues).toBeCalledWith('__name__');
+    await waitFor(() => expect(languageProvider.getLabelValues).toBeCalledWith('__name__'));
   });
 
   it('tries to load metrics with labels', async () => {
@@ -79,27 +79,27 @@ describe('PromQueryBuilder', () => {
       labels: [{ label: 'label_name', op: '=', value: 'label_value' }],
     });
     openMetricSelect(container);
-    expect(languageProvider.getSeries).toBeCalledWith('{label_name="label_value"}', true);
+    await waitFor(() => expect(languageProvider.getSeries).toBeCalledWith('{label_name="label_value"}', true));
   });
 
   it('tries to load variables in metric field', async () => {
     const { datasource, container } = setup();
     datasource.getVariables = jest.fn().mockReturnValue([]);
     openMetricSelect(container);
-    expect(datasource.getVariables).toBeCalled();
+    await waitFor(() => expect(datasource.getVariables).toBeCalled());
   });
 
   it('tries to load labels when metric selected', async () => {
     const { languageProvider } = setup();
     openLabelNameSelect();
-    expect(languageProvider.fetchSeriesLabels).toBeCalledWith('{__name__="random_metric"}');
+    await waitFor(() => expect(languageProvider.fetchSeriesLabels).toBeCalledWith('{__name__="random_metric"}'));
   });
 
   it('tries to load variables in label field', async () => {
     const { datasource } = setup();
     datasource.getVariables = jest.fn().mockReturnValue([]);
     openLabelNameSelect();
-    expect(datasource.getVariables).toBeCalled();
+    await waitFor(() => expect(datasource.getVariables).toBeCalled());
   });
 
   it('tries to load labels when metric selected and other labels are already present', async () => {
@@ -111,7 +111,9 @@ describe('PromQueryBuilder', () => {
       ],
     });
     openLabelNameSelect(1);
-    expect(languageProvider.fetchSeriesLabels).toBeCalledWith('{label_name="label_value", __name__="random_metric"}');
+    await waitFor(() =>
+      expect(languageProvider.fetchSeriesLabels).toBeCalledWith('{label_name="label_value", __name__="random_metric"}')
+    );
   });
 
   it('tries to load labels when metric is not selected', async () => {
@@ -120,7 +122,7 @@ describe('PromQueryBuilder', () => {
       metric: '',
     });
     openLabelNameSelect();
-    expect(languageProvider.fetchLabels).toBeCalled();
+    await waitFor(() => expect(languageProvider.fetchLabels).toBeCalled());
   });
 });