test: add message actions reminder test and fix broken tests

Author: MartinCupela

src/components/Message/__tests__/utils.test.js

@@ -102,9 +102,18 @@ describe('Message utils', () => {
       },
     );
 
-    it('should return all message actions if actions are set to true', () => {
+    it('should return all message actions not depending on channel config if actions are set to true', () => {
       const result = getMessageActions(true, defaultCapabilities);
-      expect(result).toStrictEqual(actions);
+      expect(result).toStrictEqual(
+        actions.filter((a) => !['remindMe', 'saveForLater'].includes(a)),
+      );
+    });
+
+    it('should include reminder actions if enabled in channel config', () => {
+      const result = getMessageActions(true, defaultCapabilities, {
+        user_message_reminders: true,
+      });
+      expect(result).toEqual(actions);
     });
 
     it.each([

src/components/Message/utils.tsx

@@ -168,20 +168,6 @@ export const getMessageActions = (
     return [];
   }
 
-  if (
-    channelConfig?.['user_message_reminders'] &&
-    messageActions.indexOf(MESSAGE_ACTIONS.remindMe)
-  ) {
-    messageActionsAfterPermission.push(MESSAGE_ACTIONS.remindMe);
-  }
-
-  if (
-    channelConfig?.['user_message_reminders'] &&
-    messageActions.indexOf(MESSAGE_ACTIONS.saveForLater)
-  ) {
-    messageActionsAfterPermission.push(MESSAGE_ACTIONS.saveForLater);
-  }
-
   if (canDelete && messageActions.indexOf(MESSAGE_ACTIONS.delete) > -1) {
     messageActionsAfterPermission.push(MESSAGE_ACTIONS.delete);
   }
@@ -214,10 +200,24 @@ export const getMessageActions = (
     messageActionsAfterPermission.push(MESSAGE_ACTIONS.react);
   }
 
+  if (
+    channelConfig?.['user_message_reminders'] &&
+    messageActions.indexOf(MESSAGE_ACTIONS.remindMe)
+  ) {
+    messageActionsAfterPermission.push(MESSAGE_ACTIONS.remindMe);
+  }
+
   if (canReply && messageActions.indexOf(MESSAGE_ACTIONS.reply) > -1) {
     messageActionsAfterPermission.push(MESSAGE_ACTIONS.reply);
   }
 
+  if (
+    channelConfig?.['user_message_reminders'] &&
+    messageActions.indexOf(MESSAGE_ACTIONS.saveForLater)
+  ) {
+    messageActionsAfterPermission.push(MESSAGE_ACTIONS.saveForLater);
+  }
+
   return messageActionsAfterPermission;
 };
 

src/components/MessageActions/__tests__/MessageActionsBox.test.js

@@ -89,7 +89,7 @@ describe('MessageActionsBox', () => {
   it('should not show any of the action buttons if no actions are returned by getMessageActions', async () => {
     const {
       result: { container, queryByText },
-    } = await renderComponent({});
+    } = await renderComponent({ message: generateMessage() });
     expect(queryByText('Flag')).not.toBeInTheDocument();
     expect(queryByText('Mute')).not.toBeInTheDocument();
     expect(queryByText('Unmute')).not.toBeInTheDocument();
@@ -106,7 +106,7 @@ describe('MessageActionsBox', () => {
     const handleFlag = jest.fn();
     const {
       result: { container, getByText },
-    } = await renderComponent({ handleFlag });
+    } = await renderComponent({ handleFlag, message: generateMessage() });
     await act(async () => {
       await fireEvent.click(getByText('Flag'));
     });
@@ -123,6 +123,7 @@ describe('MessageActionsBox', () => {
     } = await renderComponent({
       handleMute,
       isUserMuted: () => false,
+      message: generateMessage(),
     });
     await act(async () => {
       await fireEvent.click(getByText('Mute'));
@@ -140,6 +141,7 @@ describe('MessageActionsBox', () => {
     } = await renderComponent({
       handleMute,
       isUserMuted: () => true,
+      message: generateMessage(),
     });
     await act(async () => {
       await fireEvent.click(getByText('Unmute'));
@@ -154,7 +156,7 @@ describe('MessageActionsBox', () => {
     const handleEdit = jest.fn();
     const {
       result: { container, getByText },
-    } = await renderComponent({ handleEdit });
+    } = await renderComponent({ handleEdit, message: generateMessage() });
     await act(async () => {
       await fireEvent.click(getByText('Edit Message'));
     });
@@ -168,7 +170,7 @@ describe('MessageActionsBox', () => {
     const handleDelete = jest.fn();
     const {
       result: { container, getByText },
-    } = await renderComponent({ handleDelete });
+    } = await renderComponent({ handleDelete, message: generateMessage() });
     await act(async () => {
       await fireEvent.click(getByText('Delete'));
     });
@@ -180,7 +182,7 @@ describe('MessageActionsBox', () => {
   it('should call the handlePin prop if the pin button is clicked', async () => {
     getMessageActionsMock.mockImplementationOnce(() => ['pin']);
     const handlePin = jest.fn();
-    const message = generateMessage({ pinned: false });
+    const message = generateMessage({ message: generateMessage(), pinned: false });
     const {
       result: { container, getByText },
     } = await renderComponent({ handlePin, message });
@@ -195,7 +197,7 @@ describe('MessageActionsBox', () => {
   it('should call the handlePin prop if the unpin button is clicked', async () => {
     getMessageActionsMock.mockImplementationOnce(() => ['pin']);
     const handlePin = jest.fn();
-    const message = generateMessage({ pinned: true });
+    const message = generateMessage({ message: generateMessage(), pinned: true });
     const {
       result: { container, getByText },
     } = await renderComponent({ handlePin, message });

src/components/Poll/__tests__/PollCreationDialog.test.js

@@ -100,7 +100,7 @@ describe('PollCreationDialog', () => {
       await fireEvent.blur(nameInput);
     });
     expect(screen.getByTestId(NAME_INPUT_FIELD_ERROR_TEST_ID)).toHaveTextContent(
-      'Name is required',
+      'Question is required',
     );
     expect(nameInput).toHaveValue('');
     expect(screen.getByText(CANCEL_BUTTON_TEXT)).toBeEnabled();