fix: fix broken recording tests (filters excluded)

cryostatio · Sep 11, 2024 · 45ceb38 · 45ceb38
1 parent fa57316
commit 45ceb38
Show file tree

Hide file tree

Showing 10 changed files with 902 additions and 357 deletions.
diff --git a/locales/en/public.json b/locales/en/public.json
@@ -426,7 +426,15 @@
       "TITLE": "Quick starts"
     }
   },
+  "RecordingActions": {
+    "ARIA_LABELS": {
+      "MENU_TOGGLE": "recording-action-toggle"
+    }
+  },
   "RecordingFilters": {
+    "ARIA_LABELS": {
+      "MENU_TOGGLE": "recording-filters-toggle"
+    },
     "FILTER_CHIP": {
       "DURATION_CONTINUOUS": "Continuous",
       "DURATION_EXACT": "{{value}}{{unit}}",

diff --git a/src/app/Recordings/RecordingActions.tsx b/src/app/Recordings/RecordingActions.tsx
@@ -21,6 +21,7 @@ import { Divider, Dropdown, DropdownItem, DropdownList, MenuToggle, MenuToggleEl
 import { EllipsisVIcon } from '@patternfly/react-icons';
 import { Td } from '@patternfly/react-table';
 import * as React from 'react';
+import { useTranslation } from 'react-i18next';
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
 
@@ -39,6 +40,7 @@ export interface RecordingActionsProps {
 }
 
 export const RecordingActions: React.FC<RecordingActionsProps> = ({ recording, uploadFn, ...props }) => {
+  const { t } = useTranslation();
   const context = React.useContext(ServiceContext);
   const notifications = React.useContext(NotificationsContext);
   const [grafanaEnabled, setGrafanaEnabled] = React.useState(false);
@@ -111,23 +113,22 @@ export const RecordingActions: React.FC<RecordingActionsProps> = ({ recording, u
         isExpanded={isOpen}
         variant="plain"
         data-quickstart-id="recording-kebab"
+        aria-label={t('RecordingActions.ARIA_LABELS.MENU_TOGGLE')}
       >
         <EllipsisVIcon />
       </MenuToggle>
     ),
-    [setIsOpen, isOpen],
+    [t, setIsOpen, isOpen],
   );
 
   return (
     <Td {...props} isActionCell>
       <Dropdown
         toggle={toggle}
         popperProps={{
-          appendTo: document.body,
+          enableFlip: true,
           position: 'right',
-          direction: 'down',
         }}
-        aria-label={`${recording.name}-actions`}
         isOpen={isOpen}
         onOpenChange={(isOpen) => setIsOpen(isOpen)}
         onOpenChangeKeys={['Escape']}

diff --git a/src/app/Recordings/RecordingFilters.tsx b/src/app/Recordings/RecordingFilters.tsx
@@ -242,7 +242,7 @@ export const RecordingFilters: React.FC<RecordingFiltersProps> = ({
                 <FilterIcon />
               </Icon>
             }
-            aria-label={currentCategory}
+            aria-label={t('RecordingFilters.ARIA_LABELS.MENU_TOGGLE')}
             onClick={() => onCategoryToggle()}
           >
             {getCategoryDisplay(t, currentCategory)}

diff --git a/src/test/Agent/AgentLiveProbes.test.tsx b/src/test/Agent/AgentLiveProbes.test.tsx
@@ -26,7 +26,7 @@ import { defaultServices } from '@app/Shared/Services/Services';
 import '@testing-library/jest-dom';
 import { act, cleanup, screen, within } from '@testing-library/react';
 import { of } from 'rxjs';
-import { render, renderSnapshot, testT } from '../utils';
+import { createMockForPFTableRef, render, renderSnapshot, testT } from '../utils';
 
 const mockConnectUrl = 'service:jmx:rmi://someUrl';
 const mockJvmId = 'id';
@@ -94,7 +94,7 @@ jest
 
 jest
   .spyOn(defaultServices.api, 'getActiveProbes')
-  // .mockReturnValueOnce(of([mockProbe])) // renders correctly
+  .mockReturnValueOnce(of([mockProbe])) // renders correctly
 
   .mockReturnValueOnce(of([])) // should disable remove button if there is no probe
 
@@ -104,8 +104,8 @@ jest
 
 jest
   .spyOn(defaultServices.notificationChannel, 'messages')
-  // .mockReturnValueOnce(of()) // renders correctly
-  // .mockReturnValueOnce(of())
+  .mockReturnValueOnce(of()) // renders correctly
+  .mockReturnValueOnce(of())
 
   .mockReturnValueOnce(of()) // should disable remove button if there is no probe
   .mockReturnValueOnce(of())
@@ -121,9 +121,10 @@ jest
 describe('<AgentLiveProbes />', () => {
   afterEach(cleanup);
 
-  it.skip('renders correctly', async () => {
+  it('renders correctly', async () => {
     const tree = await renderSnapshot({
       routerConfigs: { routes: [{ path: '/events', element: <AgentLiveProbes /> }] },
+      createNodeMock: createMockForPFTableRef,
     });
     expect(tree?.toJSON()).toMatchSnapshot();
   });