From 099dcd28c73f09312e712a04ad9d2b4cebe6e54d Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Thu, 11 May 2023 14:29:01 +0100 Subject: [PATCH 1/2] Test tags for invite links; joining call by UR:; getting call name. --- src/Header.tsx | 2 +- src/Modal.tsx | 1 + src/room/InviteModal.tsx | 1 + src/room/LobbyView.tsx | 1 + src/room/OverflowMenu.tsx | 4 ++-- src/room/RoomAuthView.tsx | 3 ++- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Header.tsx b/src/Header.tsx index 7ccf8666..5a4f7f5e 100644 --- a/src/Header.tsx +++ b/src/Header.tsx @@ -134,7 +134,7 @@ export function RoomHeaderInfo({ roomName, avatarUrl }: RoomHeaderInfo) { /> - {roomName} + {roomName} ); } diff --git a/src/Modal.tsx b/src/Modal.tsx index 2665e116..6734e885 100644 --- a/src/Modal.tsx +++ b/src/Modal.tsx @@ -92,6 +92,7 @@ export function Modal({ {...closeButtonProps} ref={closeButtonRef} className={styles.closeButton} + data-testid="modal_close" title={t("Close")} > diff --git a/src/room/InviteModal.tsx b/src/room/InviteModal.tsx index a7f7ba52..9db8fdd9 100644 --- a/src/room/InviteModal.tsx +++ b/src/room/InviteModal.tsx @@ -41,6 +41,7 @@ export const InviteModal: FC = ({ roomIdOrAlias, ...rest }) => { diff --git a/src/room/LobbyView.tsx b/src/room/LobbyView.tsx index 2e726ccf..d05a848b 100644 --- a/src/room/LobbyView.tsx +++ b/src/room/LobbyView.tsx @@ -147,6 +147,7 @@ export function LobbyView({ value={getRoomUrl(roomIdOrAlias)} className={styles.copyButton} copiedMessage={t("Call link copied")} + data-testid="lobby_inviteLink" > Copy call link and join later diff --git a/src/room/OverflowMenu.tsx b/src/room/OverflowMenu.tsx index 0920f2d4..cfd5fb99 100644 --- a/src/room/OverflowMenu.tsx +++ b/src/room/OverflowMenu.tsx @@ -102,7 +102,7 @@ export function OverflowMenu({ <> - @@ -111,7 +111,7 @@ export function OverflowMenu({ {showInvite && ( - {t("Invite people")} + {t("Invite people")} )} diff --git a/src/room/RoomAuthView.tsx b/src/room/RoomAuthView.tsx index 11b20b8e..c3ccf0a3 100644 --- a/src/room/RoomAuthView.tsx +++ b/src/room/RoomAuthView.tsx @@ -74,6 +74,7 @@ export function RoomAuthView() { name="displayName" label={t("Display name")} placeholder={t("Display name")} + data-testid="joincall_displayName" type="text" required autoComplete="off" @@ -90,7 +91,7 @@ export function RoomAuthView() { )} -
From 9587dd7352fd7294e8bf366069b072f7532b18bc Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Thu, 11 May 2023 15:16:17 +0100 Subject: [PATCH 2/2] Prettier --- src/Header.tsx | 4 +++- src/room/RoomAuthView.tsx | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Header.tsx b/src/Header.tsx index 5a4f7f5e..410f3488 100644 --- a/src/Header.tsx +++ b/src/Header.tsx @@ -134,7 +134,9 @@ export function RoomHeaderInfo({ roomName, avatarUrl }: RoomHeaderInfo) { />
- {roomName} + + {roomName} + ); } diff --git a/src/room/RoomAuthView.tsx b/src/room/RoomAuthView.tsx index c3ccf0a3..12adcc1f 100644 --- a/src/room/RoomAuthView.tsx +++ b/src/room/RoomAuthView.tsx @@ -91,7 +91,12 @@ export function RoomAuthView() { )} -