fix promise not fullfiled by conditional state in e2e test

Author: tiagoevanp

apps/meteor/tests/e2e/messaging.spec.ts

@@ -94,51 +94,6 @@ test.describe('Messaging', () => {
 			});
 		});
 
-		test('should edit messages', async ({ page }) => {
-			await poHomeChannel.sidenav.openChat(targetChannel);
-
-			await test.step('focus on the second message', async () => {
-				await page.keyboard.press('ArrowUp');
-
-				expect(await poHomeChannel.composer.inputValue()).toBe('msg2');
-			});
-
-			await test.step('send edited message', async () => {
-				const editPromise = page.waitForResponse(
-					(response) =>
-						/api\/v1\/method.call\/updateMessage/.test(response.url()) &&
-						response.status() === 200 &&
-						response.request().method() === 'POST',
-				);
-
-				await poHomeChannel.content.sendMessage('edited msg2', false);
-				await editPromise;
-
-				await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('edited msg2');
-			});
-
-			await test.step('stress test on message editions', async () => {
-				const editPromise = page.waitForResponse(
-					(response) =>
-						/api\/v1\/method.call\/updateMessage/.test(response.url()) &&
-						response.status() === 200 &&
-						response.request().method() === 'POST',
-				);
-
-				for (const element of ['edited msg2 a', 'edited msg2 b', 'edited msg2 c', 'edited msg2 d', 'edited msg2 e']) {
-					// eslint-disable-next-line no-await-in-loop
-					await page.keyboard.press('ArrowUp');
-					// eslint-disable-next-line no-await-in-loop
-					await poHomeChannel.content.sendMessage(element, false);
-				}
-
-				await editPromise;
-				const toastError = await poToastBar.waitForError();
-
-				expect(toastError).toBe(true);
-			});
-		});
-
 		test('should navigate properly on the user card', async ({ page }) => {
 			await poHomeChannel.sidenav.openChat(targetChannel);
 
@@ -206,6 +161,53 @@ test.describe('Messaging', () => {
 		});
 	});
 
+	test.describe.serial('Message edition', () => {
+		test('should edit messages', async ({ page }) => {
+			await poHomeChannel.sidenav.openChat(targetChannel);
+
+			await test.step('focus on the second message', async () => {
+				await page.keyboard.press('ArrowUp');
+
+				expect(await poHomeChannel.composer.inputValue()).toBe('msg2');
+			});
+
+			await test.step('send edited message', async () => {
+				const editPromise = page.waitForResponse(
+					(response) =>
+						/api\/v1\/method.call\/updateMessage/.test(response.url()) &&
+						response.status() === 200 &&
+						response.request().method() === 'POST',
+				);
+
+				await poHomeChannel.content.sendMessage('edited msg2', false);
+				await editPromise;
+
+				await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('edited msg2');
+			});
+
+			await test.step('stress test on message editions', async () => {
+				const editPromise = page.waitForResponse(
+					(response) =>
+						/api\/v1\/method.call\/updateMessage/.test(response.url()) &&
+						response.status() === 200 &&
+						response.request().method() === 'POST',
+				);
+
+				for (const element of ['edited msg2 a', 'edited msg2 b', 'edited msg2 c', 'edited msg2 d', 'edited msg2 e']) {
+					// eslint-disable-next-line no-await-in-loop
+					await page.keyboard.press('ArrowUp');
+					// eslint-disable-next-line no-await-in-loop
+					await poHomeChannel.content.sendMessage(element, false);
+				}
+
+				await editPromise;
+				const toastError = await poToastBar.waitForError();
+
+				expect(toastError).toBe(true);
+			});
+		});
+	});
+
 	test.describe('Message by "chat.postMessage" API method', () => {
 		test('expect show a message', async ({ api }) => {
 			const messageText = faker.lorem.sentence();

apps/meteor/tests/e2e/page-objects/fragments/home-content.ts

@@ -90,21 +90,23 @@ export class HomeContent {
 		await this.page.waitForSelector('[name="msg"]:not([disabled])');
 		await this.page.locator('[name="msg"]').fill(text);
 
-		const responsePromise = this.page.waitForResponse(
-			(response) =>
-				/api\/v1\/method.call\/sendMessage/.test(response.url()) && response.status() === 200 && response.request().method() === 'POST',
-		);
+		if (enforce) {
+			const responsePromise = this.page.waitForResponse(
+				(response) =>
+					/api\/v1\/method.call\/sendMessage/.test(response.url()) && response.status() === 200 && response.request().method() === 'POST',
+			);
 
-		await this.page.getByRole('button', { name: 'Send', exact: true }).click();
+			await this.page.getByRole('button', { name: 'Send', exact: true }).click();
 
-		if (enforce) {
 			const response = await (await responsePromise).json();
 
 			const mid = JSON.parse(response.message).result._id;
 			const messageLocator = this.getMessageById(mid);
 
 			await expect(messageLocator).toBeVisible();
 			await expect(messageLocator).not.toHaveClass('rcx-message--pending');
+		} else {
+			await this.page.getByRole('button', { name: 'Send', exact: true }).click();
 		}
 	}