add waiter to avoid test flakiness

Author: nazabucciarelli

apps/meteor/client/views/room/MessageList/hooks/useKeepMountedMessages.spec.ts

@@ -0,0 +1,59 @@
+import type { IMessage, MessageAttachment } from '@rocket.chat/core-typings';
+
+import { useKeepMountedMessages } from './useKeepMountedMessages';
+
+const baseMessage = (overrides: Partial<IMessage> = {}): IMessage => ({
+	_id: 'messageId',
+	rid: 'roomId',
+	msg: 'text',
+	ts: new Date(),
+	u: { _id: 'userId', username: 'userName' },
+	_updatedAt: new Date(),
+	...overrides,
+});
+
+const fileAttachment: MessageAttachment = { type: 'file' } as MessageAttachment;
+
+const quoteAttachment = (attachments?: MessageAttachment[]): MessageAttachment =>
+	({
+		author_name: 'author',
+		author_icon: 'icon',
+		message_link: 'https://example.com/msg',
+		text: 'quoted text',
+		attachments,
+	}) as MessageAttachment;
+
+it('should not keep a plain text message mounted', () => {
+	const messages = [baseMessage()];
+	expect(useKeepMountedMessages(messages)).toEqual([]);
+});
+
+it('should keep a message with files mounted', () => {
+	const messages = [baseMessage({ files: [{ _id: 'fileId', name: 'file', type: 'file' }] })];
+	expect(useKeepMountedMessages(messages)).toEqual([0]);
+});
+
+it('should keep a message with a URL preview mounted', () => {
+	const messages = [baseMessage({ urls: [{ url: 'https://example.com', meta: { ogTitle: 'title' } }] })];
+	expect(useKeepMountedMessages(messages)).toEqual([0]);
+});
+
+it('should keep a message quoting a file attachment mounted', () => {
+	const messages = [baseMessage({ attachments: [quoteAttachment([fileAttachment])] })];
+	expect(useKeepMountedMessages(messages)).toEqual([0]);
+});
+
+it('should keep a message quoting a quote of a file attachment mounted (recursive)', () => {
+	const messages = [baseMessage({ attachments: [quoteAttachment([quoteAttachment([fileAttachment])])] })];
+	expect(useKeepMountedMessages(messages)).toEqual([0]);
+});
+
+it('should not keep a message quoting text (no nested file) mounted', () => {
+	const messages = [baseMessage({ attachments: [quoteAttachment()] })];
+	expect(useKeepMountedMessages(messages)).toEqual([]);
+});
+
+it('should offset indexes by one when canPreview is true', () => {
+	const messages = [baseMessage(), baseMessage({ files: [{ _id: 'fileId', name: 'file', type: 'file' }] })];
+	expect(useKeepMountedMessages(messages, true)).toEqual([2]);
+});

apps/meteor/tests/e2e/message-attachment-collapse.spec.ts

@@ -37,6 +37,12 @@ test.describe.serial('Message Attachment Collapse', () => {
 		});
 	};
 
+	const waitForFloodToSettle = async (api: BaseTest['api'], channel: string): Promise<void> => {
+		const marker = `flood settled ${faker.string.uuid()}`;
+		await api.post('/chat.postMessage', { channel, text: marker });
+		await expect(poHomeChannel.content.mainMessageList.getByText(marker)).toBeVisible();
+	};
+
 	test.describe('Default preference (expanded by default)', () => {
 		let targetChannel: string;
 
@@ -88,6 +94,7 @@ test.describe.serial('Message Attachment Collapse', () => {
 			await expect(poHomeChannel.content.mainMessageList.getByText(text)).toBeHidden();
 
 			await floodChannel(api, targetChannel, 30);
+			await waitForFloodToSettle(api, targetChannel);
 
 			await scrollUp();
 
@@ -130,6 +137,7 @@ test.describe.serial('Message Attachment Collapse', () => {
 			await expect(poHomeChannel.content.mainMessageList.getByText(text)).toBeVisible();
 
 			await floodChannel(api, targetChannel, 30);
+			await waitForFloodToSettle(api, targetChannel);
 
 			await scrollUp();