chore: Fix triggers flaky tests

RocketChat · Sep 29, 2023 · 58788c7 · 58788c7
1 parent 12e66c0
commit 58788c7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/apps/meteor/app/livechat/imports/server/rest/triggers.ts b/apps/meteor/app/livechat/imports/server/rest/triggers.ts
@@ -3,7 +3,7 @@ import { isGETLivechatTriggersParams, isPOSTLivechatTriggersParams } from '@rock
 
 import { API } from '../../../../api/server';
 import { getPaginationItems } from '../../../../api/server/helpers/getPaginationItems';
-import { findTriggers, findTriggerById } from '../../../server/api/lib/triggers';
+import { findTriggers, findTriggerById, deleteTrigger } from '../../../server/api/lib/triggers';
 
 API.v1.addRoute(
 	'livechat/triggers',
@@ -57,5 +57,12 @@ API.v1.addRoute(
 				trigger,
 			});
 		},
+		async delete() {
+			await deleteTrigger({
+				triggerId: this.urlParams._id,
+			});
+
+			return API.v1.success();
+		},
 	},
 );
diff --git a/apps/meteor/app/livechat/server/api/lib/triggers.ts b/apps/meteor/app/livechat/server/api/lib/triggers.ts
@@ -29,3 +29,7 @@ export async function findTriggers({
 export async function findTriggerById({ triggerId }: { triggerId: string }): Promise<ILivechatTrigger | null> {
 	return LivechatTrigger.findOneById(triggerId);
 }
+
+export async function deleteTrigger({ triggerId }: { triggerId: string }): Promise<void> {
+	await LivechatTrigger.removeById(triggerId);
+}
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-triggers.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-triggers.spec.ts
@@ -29,6 +29,7 @@ test.describe.serial('Omnichannel Triggers', () => {
 
 		const { page } = await createAuxContext(browser, Users.user1, '/omnichannel/triggers');
 		agent = { page, poHomeOmnichannel: new HomeOmnichannel(page) };
+		await page.emulateMedia({ reducedMotion: 'reduce' });
 	});
 
 	test.beforeEach(async ({ page, api }) => {
@@ -39,6 +40,7 @@ test.describe.serial('Omnichannel Triggers', () => {
 		await Promise.all([
 			api.delete('/livechat/users/agent/user1'),
 			api.delete('/livechat/users/manager/user1'),
+			api.delete(`/livechat/triggers/${triggersName}`),
 			api.post('/settings/Livechat_clear_local_storage_when_chat_ended', { value: false }),
 		]);
 		await agent.page.close();

diff --git a/packages/livechat/src/components/Modal/styles.scss b/packages/livechat/src/components/Modal/styles.scss
@@ -59,6 +59,12 @@ $modal-background-color: $bg-color-white;
 	line-height: 1.5;
 }
 
+@media (prefers-reduced-motion) {
+	.modal--animated {
+		animation: none;
+	}
+}
+
 @keyframes fadeInUp {
 	0% {
 		transform: translate3d(-50%, 100%, 0);

diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
@@ -3588,6 +3588,7 @@ export type OmnichannelEndpoints = {
 	};
 	'/v1/livechat/triggers/:_id': {
 		GET: () => { trigger: ILivechatTrigger | null };
+		DELETE: () => void;
 	};
 	'/v1/livechat/rooms': {
 		GET: (params: GETLivechatRoomsParams) => PaginatedResult<{ rooms: IOmnichannelRoom[] }>;