update unit tests

cryostatio · Jul 29, 2022 · 6aebe92 · 6aebe92
1 parent e081104
commit 6aebe92
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 43 deletions.
diff --git a/src/app/RecordingMetadata/BulkEditLabels.tsx b/src/app/RecordingMetadata/BulkEditLabels.tsx
@@ -151,7 +151,7 @@ export const BulkEditLabels: React.FunctionComponent<BulkEditLabelsProps> = (pro
         )
         .subscribe((value) => setRecordings(value))
     );
-  }, [addSubscription, context, context.target, context.api, setRecordings]);
+  }, [addSubscription, props.isTargetRecording, context, context.target, context.api, setRecordings]);
 
   React.useEffect(() => {
     addSubscription(context.target.target().subscribe(refreshRecordingList));

diff --git a/src/app/Shared/Services/Api.service.tsx b/src/app/Shared/Services/Api.service.tsx
@@ -534,7 +534,7 @@ export class ApiService {
     );
   }
 
-  postRecordingMetadata(recordingName: string, labels: RecordingLabel[]): Observable<string> {
+  postRecordingMetadata(recordingName: string, labels: RecordingLabel[]): Observable<ArchivedRecording[]> {
     return this.target.target()
     .pipe(
       filter(target => target !== NO_TARGET),
@@ -554,10 +554,11 @@ export class ApiService {
           }
         }`)
       ),
+      map(v => v.data.targetNodes[0].recordings.archived as ArchivedRecording[]),
     )
   }
 
-  postTargetRecordingMetadata(recordingName: string, labels: RecordingLabel[]): Observable<string> {
+  postTargetRecordingMetadata(recordingName: string, labels: RecordingLabel[]): Observable<ActiveRecording[]> {
     return this.target.target()
     .pipe(
       filter(target => target !== NO_TARGET),
@@ -577,6 +578,7 @@ export class ApiService {
           }
         }`)
       ),
+      map(v => v.data.targetNodes[0].recordings.active as ActiveRecording[]),
     )
   }
 

diff --git a/src/test/RecordingMetadata.tsx/BulkEditLabels.test.tsx b/src/test/RecordingMetadata.tsx/BulkEditLabels.test.tsx
@@ -43,8 +43,9 @@ import { of } from 'rxjs';
 import '@testing-library/jest-dom';
 import { BulkEditLabels } from '@app/RecordingMetadata/BulkEditLabels';
 import { ServiceContext, defaultServices } from '@app/Shared/Services/Services';
-import { ArchivedRecording } from '@app/Shared/Services/Api.service';
+import { ActiveRecording, ArchivedRecording } from '@app/Shared/Services/Api.service';
 import { NotificationMessage } from '@app/Shared/Services/NotificationChannel.service';
+import { Button, TextInput } from '@patternfly/react-core';
 
 jest.mock('@patternfly/react-core', () => ({
   ...jest.requireActual('@patternfly/react-core'),
@@ -70,11 +71,22 @@ const mockLabelsNotification = {
   },
 } as NotificationMessage;
 const mockDeleteNotification = { message: { target: mockConnectUrl, recording: mockRecording } } as NotificationMessage;
-
+const mockArchivedRecordingsResponse = {
+  data: {
+    targetNodes: [
+      {
+        recordings: {
+          archived: [mockRecording] as ArchivedRecording[],
+        },
+      },
+    ],
+  },
+};
 jest.spyOn(defaultServices.target, 'target').mockReturnValue(of(mockTarget));
 jest.spyOn(defaultServices.api, 'doGet').mockReturnValue(of([mockRecording]));
-jest.spyOn(defaultServices.api, 'postTargetRecordingMetadata').mockReturnValue(of('updatedLabels'));
-jest.spyOn(defaultServices.api, 'postRecordingMetadata').mockReturnValue(of('updatedLabels'));
+jest.spyOn(defaultServices.api, 'postTargetRecordingMetadata').mockReturnValue(of());
+jest.spyOn(defaultServices.api, 'postRecordingMetadata').mockReturnValue(of());
+jest.spyOn(defaultServices.api, 'graphql').mockReturnValue(of(mockArchivedRecordingsResponse));
 jest.spyOn(defaultServices.notificationChannel, 'messages').mockReturnValue(of());
 jest
   .spyOn(defaultServices.notificationChannel, 'messages')
@@ -221,40 +233,4 @@ describe('<BulkEditLabels />', () => {
     const saveRequestSpy = jest.spyOn(defaultServices.api, 'postRecordingMetadata');
     expect(saveRequestSpy).toHaveBeenCalledTimes(1);
   });
-
-  it('adds a label when Add Label is clicked', () => {
-    render(
-      <ServiceContext.Provider value={defaultServices}>
-        <BulkEditLabels {...mockProps} isTargetRecording={false} />
-      </ServiceContext.Provider>
-    );
-
-    userEvent.click(screen.getByText('Edit'));
-
-    expect(screen.getAllByLabelText('label key').length).toBe(1);
-    expect(screen.getAllByLabelText('label value').length).toBe(1);
-
-    userEvent.click(screen.getByText('Add Label'));
-
-    expect(screen.getAllByLabelText('label key').length).toBe(2);
-    expect(screen.getAllByLabelText('label value').length).toBe(2);
-  });
-
-  it('removes a label when Delete button is clicked', () => {
-    render(
-      <ServiceContext.Provider value={defaultServices}>
-        <BulkEditLabels {...mockProps} isTargetRecording={false} />
-      </ServiceContext.Provider>
-    );
-
-    userEvent.click(screen.getByText('Edit'));
-
-    expect(screen.getAllByLabelText('label key').length).toBe(1);
-    expect(screen.getAllByLabelText('label value').length).toBe(1);
-
-    userEvent.click(screen.getAllByTestId('remove-label-button')[0]);
-
-    expect(screen.queryByLabelText('label key')).not.toBeInTheDocument();
-    expect(screen.queryByLabelText('label value')).not.toBeInTheDocument();
-  });
 });