From 74b59a305e38ae321cc26ec81d3cefd4c3356f14 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Thu, 7 Mar 2024 15:07:41 -0300
Subject: [PATCH] Update e2ee tests

---
 .../RoomView/components/EncryptedRoom.tsx      |  2 +-
 e2e/tests/assorted/01-e2eencryption.spec.ts    | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/views/RoomView/components/EncryptedRoom.tsx b/app/views/RoomView/components/EncryptedRoom.tsx
index c69e63a9f..04afd012e 100644
--- a/app/views/RoomView/components/EncryptedRoom.tsx
+++ b/app/views/RoomView/components/EncryptedRoom.tsx
@@ -34,7 +34,7 @@ export const EncryptedRoom = ({
 	};
 
 	return (
-		<View style={styles.root}>
+		<View style={styles.root} testID='room-view-encrypted-room'>
 			<View style={styles.container}>
 				<View style={styles.textView}>
 					<View style={styles.icon}>
diff --git a/e2e/tests/assorted/01-e2eencryption.spec.ts b/e2e/tests/assorted/01-e2eencryption.spec.ts
index c455740b7..34237e4c0 100644
--- a/e2e/tests/assorted/01-e2eencryption.spec.ts
+++ b/e2e/tests/assorted/01-e2eencryption.spec.ts
@@ -5,14 +5,14 @@ import {
 	login,
 	sleep,
 	tapBack,
-	searchRoom,
 	logout,
 	platformTypes,
 	TTextMatcher,
 	tapAndWaitFor,
 	expectValidRegisterOrRetry,
 	mockMessage,
-	tryTapping
+	tryTapping,
+	navigateToRoom
 } from '../../helpers/app';
 import data from '../../data';
 import { createRandomUser, deleteCreatedUsers, IDeleteCreateUser, ITestUser } from '../../helpers/data_setup';
@@ -40,14 +40,6 @@ const checkBanner = async () => {
 		.withTimeout(10000);
 };
 
-async function navigateToRoom(roomName: string) {
-	await searchRoom(`${roomName}`);
-	await element(by.id(`rooms-list-view-item-${roomName}`)).tap();
-	await waitFor(element(by.id('room-view')))
-		.toBeVisible()
-		.withTimeout(5000);
-}
-
 async function waitForToast() {
 	await sleep(300);
 }
@@ -298,7 +290,9 @@ describe('E2E Encryption', () => {
 				await waitFor(element(by[textMatcher](mockedMessageText)).atIndex(0))
 					.not.toExist()
 					.withTimeout(2000);
-				await expect(element(by.label('Encrypted message')).atIndex(0)).toExist();
+				await waitFor(element(by.id('room-view-encrypted-room')))
+					.toBeVisible()
+					.withTimeout(2000);
 			});
 
 			it('should enter new e2e password and messages should be decrypted', async () => {
@@ -431,4 +425,6 @@ describe('E2E Encryption', () => {
 			await checkBanner();
 		});
 	});
+
+	// TODO: missing request e2ee room key
 });