chore: refactored current chats e2e tests (#31100)

* chore: added necessary id's for current chats e2e tests * chore: methods to test current chats, on hold and return button * chore: renamed take chat button locator * chore: current chats page object * chore: refactored current chats e2e tests * chore: skipping test on community edition * chore: allow agent to place room on hold * chore: allow agent to place room on hold without engaging * chore: queued conversation adjustments
RocketChat · Dec 13, 2023 · 185e36f · 185e36f
1 parent b78845a
commit 185e36f
Show file tree

Hide file tree

Showing 10 changed files with 442 additions and 86 deletions.
diff --git a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx
@@ -176,7 +176,7 @@ const CurrentChatsPage = ({ id, onRowClick }: { id?: string; onRowClick: (_id: s
 			};
 
 			return (
-				<GenericTableRow key={_id} onClick={(): void => onRowClick(_id)} action>
+				<GenericTableRow key={_id} onClick={(): void => onRowClick(_id)} action data-qa-id={fname}>
 					{isPriorityEnabled && (
 						<GenericTableCell withTruncatedText data-qa='current-chats-cell-priority'>
 							<PriorityIcon level={priorityWeight} />

diff --git a/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx b/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx
@@ -98,7 +98,14 @@ const FilterByText: FilterByTextType = ({ setFilter, reload, customFields, setCu
 		};
 
 		setModal(
-			<GenericModal variant='danger' onConfirm={onDeleteAll} onClose={handleClose} onCancel={handleClose} confirmText={t('Delete')} />,
+			<GenericModal
+				variant='danger'
+				data-qa-id='current-chats-modal-remove-all-closed'
+				onConfirm={onDeleteAll}
+				onClose={handleClose}
+				onCancel={handleClose}
+				confirmText={t('Delete')}
+			/>,
 		);
 	});
 
@@ -114,8 +121,17 @@ const FilterByText: FilterByTextType = ({ setFilter, reload, customFields, setCu
 					<AutoCompleteAgent haveAll value={servedBy} onChange={handleServedBy} />
 				</Box>
 				<Box display='flex' mie={8} flexGrow={1} flexDirection='column'>
-					<Label mb={4}>{t('Status')}</Label>
-					<Select options={statusOptions} value={status} onChange={handleStatus} placeholder={t('Status')} data-qa='current-chats-status' />
+					<Label mb={4} id='current-chats-status'>
+						{t('Status')}
+					</Label>
+					<Select
+						options={statusOptions}
+						value={status}
+						onChange={handleStatus}
+						placeholder={t('Status')}
+						aria-labelledby='current-chats-status'
+						data-qa='current-chats-status'
+					/>
 				</Box>
 				<Box display='flex' mie={8} flexGrow={0} flexDirection='column'>
 					<Label mb={4}>{t('From')}</Label>
@@ -140,7 +156,7 @@ const FilterByText: FilterByTextType = ({ setFilter, reload, customFields, setCu
 			</Box>
 			{CurrentChatTags && (
 				<Box display='flex' flexDirection='row' marginBlockStart={8} {...props}>
-					<Box display='flex' mie={8} flexGrow={1} flexDirection='column'>
+					<Box display='flex' mie={8} flexGrow={1} flexDirection='column' data-qa='current-chats-tags'>
 						<Label mb={4}>{t('Tags')}</Label>
 						<CurrentChatTags value={tags} handler={handleTags} viewAll />
 					</Box>

diff --git a/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx b/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx
@@ -35,7 +35,14 @@ const RemoveChatButton: FC<{ _id: string }> = ({ _id }) => {
 		};
 
 		setModal(
-			<GenericModal variant='danger' onConfirm={onDeleteAgent} onClose={handleClose} onCancel={handleClose} confirmText={t('Delete')} />,
+			<GenericModal
+				variant='danger'
+				data-qa-id='current-chats-modal-remove'
+				onConfirm={onDeleteAgent}
+				onClose={handleClose}
+				onCancel={handleClose}
+				confirmText={t('Delete')}
+			/>,
 		);
 	});
 

diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-close-inquiry.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-close-inquiry.spec.ts
@@ -49,7 +49,7 @@ test.describe('Omnichannel close inquiry', () => {
 
 		await test.step('Expect to have 1 omnichannel assigned to agent 1', async () => {
 			await agent.poHomeOmnichannel.sidenav.openQueuedOmnichannelChat(newUser.name);
-			await expect(agent.poHomeOmnichannel.content.takeOmnichannelChatButton).toBeVisible();
+			await expect(agent.poHomeOmnichannel.content.btnTakeChat).toBeVisible();
 		});
 
 		await test.step('Expect to be able to close an inquiry conversation', async () => {
@@ -62,8 +62,8 @@ test.describe('Omnichannel close inquiry', () => {
 		await test.step('Expect to inquiry be closed when navigate back', async () => {
 			await agent.poHomeOmnichannel.sidenav.openAdministrationByLabel('Omnichannel');
 			await agent.poHomeOmnichannel.omnisidenav.linkCurrentChats.click();
-			await agent.poHomeOmnichannel.currentChats.openChat(newUser.name);
-			await expect(agent.poHomeOmnichannel.content.takeOmnichannelChatButton).not.toBeVisible();
+			await agent.poHomeOmnichannel.currentChats.findRowByName(newUser.name).click();
+			await expect(agent.poHomeOmnichannel.content.btnTakeChat).not.toBeVisible();
 		});
 	});
 });