test: fix outdated updated e2e tests

Author: dougfabris

apps/meteor/tests/e2e/e2e-encryption/e2ee-file-encryption.spec.ts

@@ -55,10 +55,10 @@ test.describe('E2EE File Encryption', () => {
 			await poHomeChannel.content.getFileComposerByName('any_file.txt').click();
 			await poHomeChannel.content.inputFileUploadName.fill(updatedFileName);
 			await poHomeChannel.content.btnUpdateFileUpload.click();
-			await poHomeChannel.content.btnSendMainComposer.click();
+			await poHomeChannel.content.sendMessage('any_description');
 
 			await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
-			await expect(poHomeChannel.content.getFileDescription).not.toBeVisible();
+			await expect(poHomeChannel.content.getFileDescription).toHaveText('any_description');
 			await expect(poHomeChannel.content.lastMessageFileName).toContainText(updatedFileName);
 		});
 

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

@@ -166,10 +166,6 @@ export class HomeContent {
 		return this.page.getByRole('button', { name: 'Dismiss quoted message' });
 	}
 
-	get descriptionInput(): Locator {
-		return this.page.locator('//div[@id="modal-root"]//fieldset//div[2]//span//input');
-	}
-
 	get getFileDescription(): Locator {
 		return this.page.locator('[data-qa-type="message"]:last-child [data-qa-type="message-body"]');
 	}
@@ -424,7 +420,7 @@ export class HomeContent {
 		await this.page.locator('[role=dialog][data-qa="DropTargetOverlay"]').dispatchEvent('drop', { dataTransfer });
 	}
 
-	async dragAndDropTxtFileToThread(): Promise<void> {
+	async dragAndDropTxtFileToThread({ waitForResponse = true } = {}): Promise<void> {
 		const contract = await fs.readFile(getFilePath('any_file.txt'), 'utf-8');
 		const dataTransfer = await this.page.evaluateHandle((contract) => {
 			const data = new DataTransfer();
@@ -436,8 +432,11 @@ export class HomeContent {
 		}, contract);
 
 		await this.inputThreadMessage.dispatchEvent('dragenter', { dataTransfer });
-
 		await this.page.locator('[role=dialog][data-qa="DropTargetOverlay"]').dispatchEvent('drop', { dataTransfer });
+
+		if (waitForResponse) {
+			await waitForMediaResponse(this.page);
+		}
 	}
 
 	async sendFileMessage(fileName: string, { waitForResponse = true } = {}): Promise<void> {

apps/meteor/tests/e2e/prune-messages.spec.ts

@@ -42,7 +42,7 @@ test.describe('prune-messages', () => {
 			} = poHomeChannel;
 
 			await content.sendFileMessage('any_file.txt');
-			await content.btnModalConfirm.click();
+			await content.btnSendMainComposer.click();
 			await expect(content.lastMessageFileName).toHaveText('any_file.txt');
 
 			await sendTargetChannelMessage(api, targetChannel.fname as string, {
@@ -109,8 +109,7 @@ test.describe('prune-messages', () => {
 			} = poHomeChannel;
 
 			await content.sendFileMessage('any_file.txt');
-			await content.descriptionInput.fill('a message with a file');
-			await content.btnModalConfirm.click();
+			await content.btnSendMainComposer.click();
 			await expect(content.lastMessageFileName).toHaveText('any_file.txt');
 
 			await test.step('prune files only', async () => {
@@ -144,8 +143,7 @@ test.describe('prune-messages', () => {
 			const { content } = poHomeChannel;
 
 			await content.sendFileMessage('any_file.txt');
-			await content.descriptionInput.fill('a message with a file');
-			await content.btnModalConfirm.click();
+			await content.btnSendMainComposer.click();
 			await expect(content.lastMessageFileName).toHaveText('any_file.txt');
 
 			await content.lastUserMessage.hover();