From 191e534ffc2f7041f9245e09ae84652c46cce7a8 Mon Sep 17 00:00:00 2001
From: Tasso <tasso.evangelista@rocket.chat>
Date: Sat, 22 Jun 2024 23:48:58 -0300
Subject: [PATCH] Remove `this.retries(0)`

---
 apps/meteor/.mocharc.api.js                               | 7 ++++---
 apps/meteor/tests/end-to-end/api/00-autotranslate.ts      | 4 +---
 apps/meteor/tests/end-to-end/api/00-miscellaneous.ts      | 4 +---
 apps/meteor/tests/end-to-end/api/01-users.ts              | 3 +--
 apps/meteor/tests/end-to-end/api/02-channels.ts           | 4 +---
 apps/meteor/tests/end-to-end/api/03-groups.ts             | 4 +---
 apps/meteor/tests/end-to-end/api/04-direct-message.ts     | 4 +---
 apps/meteor/tests/end-to-end/api/05-chat.ts               | 3 +--
 .../tests/end-to-end/api/06-outgoing-integrations.ts      | 4 +---
 .../tests/end-to-end/api/07-incoming-integrations.ts      | 4 +---
 apps/meteor/tests/end-to-end/api/08-settings.ts           | 4 +---
 apps/meteor/tests/end-to-end/api/09-rooms.ts              | 4 +---
 apps/meteor/tests/end-to-end/api/10-subscriptions.ts      | 4 +---
 apps/meteor/tests/end-to-end/api/11-permissions.ts        | 4 +---
 apps/meteor/tests/end-to-end/api/12-emoji-custom.ts       | 4 +---
 apps/meteor/tests/end-to-end/api/14-assets.ts             | 4 +---
 apps/meteor/tests/end-to-end/api/16-commands.ts           | 4 +---
 apps/meteor/tests/end-to-end/api/17-custom-sounds.ts      | 4 +---
 apps/meteor/tests/end-to-end/api/17-custom-user-status.ts | 4 +---
 apps/meteor/tests/end-to-end/api/17-webdav.ts             | 4 +---
 apps/meteor/tests/end-to-end/api/18-oauthapps.ts          | 3 +--
 apps/meteor/tests/end-to-end/api/19-statistics.ts         | 4 +---
 apps/meteor/tests/end-to-end/api/20-licenses.ts           | 3 +--
 apps/meteor/tests/end-to-end/api/21-banners.ts            | 4 +---
 apps/meteor/tests/end-to-end/api/22-push.ts               | 4 +---
 apps/meteor/tests/end-to-end/api/23-invites.ts            | 3 +--
 apps/meteor/tests/end-to-end/api/24-methods.ts            | 4 +---
 apps/meteor/tests/end-to-end/api/26-LDAP.ts               | 4 +---
 apps/meteor/tests/end-to-end/api/27-moderation.ts         | 4 +---
 apps/meteor/tests/end-to-end/api/27-presence.ts           | 3 +--
 apps/meteor/tests/end-to-end/api/28-roles.ts              | 4 +---
 apps/meteor/tests/end-to-end/api/29-oauth-server.ts       | 4 +---
 apps/meteor/tests/end-to-end/api/30-calendar.ts           | 4 +---
 .../tests/end-to-end/api/31-failed-login-attempts.ts      | 4 +---
 apps/meteor/tests/end-to-end/api/32-assets.ts             | 4 +---
 apps/meteor/tests/end-to-end/api/33-federation.ts         | 4 +---
 apps/meteor/tests/end-to-end/api/import.spec.ts           | 4 +---
 apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts     | 7 +++----
 apps/meteor/tests/end-to-end/api/livechat/01-agents.ts    | 3 +--
 .../meteor/tests/end-to-end/api/livechat/02-appearance.ts | 4 +---
 .../tests/end-to-end/api/livechat/03-custom-fields.ts     | 4 +---
 .../meteor/tests/end-to-end/api/livechat/04-dashboards.ts | 1 -
 apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts | 4 +---
 .../tests/end-to-end/api/livechat/06-integrations.ts      | 4 +---
 apps/meteor/tests/end-to-end/api/livechat/07-queue.ts     | 4 +---
 apps/meteor/tests/end-to-end/api/livechat/08-triggers.ts  | 4 +---
 apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts  | 3 +--
 apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts  | 4 +---
 apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts | 8 +++-----
 apps/meteor/tests/end-to-end/api/livechat/13-tags.ts      | 4 +---
 apps/meteor/tests/end-to-end/api/livechat/14-units.ts     | 4 +---
 .../tests/end-to-end/api/livechat/15-canned-responses.ts  | 4 +---
 .../meteor/tests/end-to-end/api/livechat/16-video-call.ts | 4 +---
 .../tests/end-to-end/api/livechat/17-dashboards-ee.ts     | 4 +---
 apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts  | 4 +---
 .../tests/end-to-end/api/livechat/19-business-hours.ts    | 4 +---
 .../api/livechat/methods/changeLivechatStatus.ts          | 4 +---
 apps/meteor/tests/end-to-end/apps/00-installation.ts      | 4 +---
 apps/meteor/tests/end-to-end/apps/01-send-messages.ts     | 3 +--
 .../tests/end-to-end/apps/02-send-messages-as-user.ts     | 3 +--
 .../tests/end-to-end/apps/03-slash-command-test-simple.ts | 4 +---
 .../apps/04-slash-command-test-with-arguments.ts          | 4 +---
 apps/meteor/tests/end-to-end/apps/05-video-conferences.ts | 4 +---
 apps/meteor/tests/end-to-end/apps/apps-uninstall.ts       | 3 +--
 64 files changed, 70 insertions(+), 182 deletions(-)

diff --git a/apps/meteor/.mocharc.api.js b/apps/meteor/.mocharc.api.js
index 6224a356642c..b73a24a275e4 100644
--- a/apps/meteor/.mocharc.api.js
+++ b/apps/meteor/.mocharc.api.js
@@ -1,13 +1,14 @@
 'use strict';
 
-/**
+/*
  * Mocha configuration for REST API integration tests.
  */
 
-module.exports = {
+module.exports = /** @satisfies {import('mocha').MochaOptions} */ ({
 	...require('./.mocharc.base.json'), // see https://github.com/mochajs/mocha/issues/3916
 	timeout: 10000,
 	bail: true,
+	retries: 0,
 	file: 'tests/end-to-end/teardown.ts',
 	spec: ['tests/end-to-end/api/**/*', 'tests/end-to-end/apps/*'],
-};
+});
diff --git a/apps/meteor/tests/end-to-end/api/00-autotranslate.ts b/apps/meteor/tests/end-to-end/api/00-autotranslate.ts
index 2191aa6cd96b..3b5e03e8016f 100644
--- a/apps/meteor/tests/end-to-end/api/00-autotranslate.ts
+++ b/apps/meteor/tests/end-to-end/api/00-autotranslate.ts
@@ -24,9 +24,7 @@ const resetE2EDefaults = async () => {
 	await Promise.all([updateSetting('E2E_Enabled_Default_PrivateRooms', false), updateSetting('E2E_Enable', false)]);
 };
 
-describe('AutoTranslate', function () {
-	this.retries(0);
-
+describe('AutoTranslate', () => {
 	before((done) => getCredentials(done));
 
 	describe('[AutoTranslate]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/00-miscellaneous.ts b/apps/meteor/tests/end-to-end/api/00-miscellaneous.ts
index 755fb1ed37b8..6469ef051a24 100644
--- a/apps/meteor/tests/end-to-end/api/00-miscellaneous.ts
+++ b/apps/meteor/tests/end-to-end/api/00-miscellaneous.ts
@@ -14,9 +14,7 @@ import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login as doLogin } from '../../data/users.helper';
 import { IS_EE } from '../../e2e/config/constants';
 
-describe('miscellaneous', function () {
-	this.retries(0);
-
+describe('miscellaneous', () => {
 	before((done) => getCredentials(done));
 
 	describe('API default', () => {
diff --git a/apps/meteor/tests/end-to-end/api/01-users.ts b/apps/meteor/tests/end-to-end/api/01-users.ts
index 81348016dda6..f34a424597af 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.ts
+++ b/apps/meteor/tests/end-to-end/api/01-users.ts
@@ -178,10 +178,9 @@ const updateUserInDb = async (userId: IUser['_id'], userData: Partial<IUser>) =>
 	await connection.close();
 };
 
-describe('[Users]', function () {
+describe('[Users]', () => {
 	let targetUser: { _id: IUser['_id']; username: string };
 	let userCredentials: Credentials;
-	this.retries(0);
 
 	before((done) => getCredentials(done));
 
diff --git a/apps/meteor/tests/end-to-end/api/02-channels.ts b/apps/meteor/tests/end-to-end/api/02-channels.ts
index f5cf54446e90..193502195ef2 100644
--- a/apps/meteor/tests/end-to-end/api/02-channels.ts
+++ b/apps/meteor/tests/end-to-end/api/02-channels.ts
@@ -28,12 +28,10 @@ function getRoomInfo(roomId: IRoom['_id']) {
 	});
 }
 
-describe('[Channels]', function () {
+describe('[Channels]', () => {
 	let channel: Pick<IRoom, '_id' | 'name'>;
 	const apiPublicChannelName = `api-channel-test-${Date.now()}`;
 
-	this.retries(0);
-
 	before((done) => getCredentials(done));
 
 	before('Creating channel', (done) => {
diff --git a/apps/meteor/tests/end-to-end/api/03-groups.ts b/apps/meteor/tests/end-to-end/api/03-groups.ts
index dc5472b745b2..702a8bf5f840 100644
--- a/apps/meteor/tests/end-to-end/api/03-groups.ts
+++ b/apps/meteor/tests/end-to-end/api/03-groups.ts
@@ -28,14 +28,12 @@ function getRoomInfo(roomId: IRoom['_id']) {
 	});
 }
 
-describe('[Groups]', function () {
+describe('[Groups]', () => {
 	let group: {
 		_id: string;
 		name: string;
 	};
 
-	this.retries(0);
-
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/04-direct-message.ts b/apps/meteor/tests/end-to-end/api/04-direct-message.ts
index 0868a16be135..b150c9f7669d 100644
--- a/apps/meteor/tests/end-to-end/api/04-direct-message.ts
+++ b/apps/meteor/tests/end-to-end/api/04-direct-message.ts
@@ -11,9 +11,7 @@ import { password, adminUsername } from '../../data/user';
 import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('[Direct Messages]', function () {
-	this.retries(0);
-
+describe('[Direct Messages]', () => {
 	let directMessage: { _id: IRoom['_id'] };
 
 	before((done) => getCredentials(done));
diff --git a/apps/meteor/tests/end-to-end/api/05-chat.ts b/apps/meteor/tests/end-to-end/api/05-chat.ts
index a874fb2d907d..6e2f004b47f0 100644
--- a/apps/meteor/tests/end-to-end/api/05-chat.ts
+++ b/apps/meteor/tests/end-to-end/api/05-chat.ts
@@ -23,8 +23,7 @@ const pinMessage = ({ msgId }: { msgId: IMessage['_id'] }) => {
 	});
 };
 
-describe('[Chat]', function () {
-	this.retries(0);
+describe('[Chat]', () => {
 	let testChannel: IRoom;
 	let message: { _id: IMessage['_id'] };
 
diff --git a/apps/meteor/tests/end-to-end/api/06-outgoing-integrations.ts b/apps/meteor/tests/end-to-end/api/06-outgoing-integrations.ts
index 4887ab1e7aa3..5ed7f8604db1 100644
--- a/apps/meteor/tests/end-to-end/api/06-outgoing-integrations.ts
+++ b/apps/meteor/tests/end-to-end/api/06-outgoing-integrations.ts
@@ -10,9 +10,7 @@ import { password } from '../../data/user';
 import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('[Outgoing Integrations]', function () {
-	this.retries(0);
-
+describe('[Outgoing Integrations]', () => {
 	let integrationCreatedByAnUser: IIntegration;
 	let user: TestUser<IUser>;
 	let userCredentials: Credentials;
diff --git a/apps/meteor/tests/end-to-end/api/07-incoming-integrations.ts b/apps/meteor/tests/end-to-end/api/07-incoming-integrations.ts
index 9dd3d0819b95..ff475945a9ac 100644
--- a/apps/meteor/tests/end-to-end/api/07-incoming-integrations.ts
+++ b/apps/meteor/tests/end-to-end/api/07-incoming-integrations.ts
@@ -11,9 +11,7 @@ import { password } from '../../data/user';
 import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('[Incoming Integrations]', function () {
-	this.retries(0);
-
+describe('[Incoming Integrations]', () => {
 	let integration: IIntegration;
 	let integrationCreatedByAnUser: IIntegration;
 	let user: TestUser<IUser>;
diff --git a/apps/meteor/tests/end-to-end/api/08-settings.ts b/apps/meteor/tests/end-to-end/api/08-settings.ts
index 906d29b61584..3a03ecbe9226 100644
--- a/apps/meteor/tests/end-to-end/api/08-settings.ts
+++ b/apps/meteor/tests/end-to-end/api/08-settings.ts
@@ -5,9 +5,7 @@ import { before, describe, it, after } from 'mocha';
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { updateSetting } from '../../data/permissions.helper';
 
-describe('[Settings]', function () {
-	this.retries(0);
-
+describe('[Settings]', () => {
 	before((done) => getCredentials(done));
 
 	describe('[/settings.public]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/09-rooms.ts b/apps/meteor/tests/end-to-end/api/09-rooms.ts
index 0876f64324e5..03d33ecd3b8d 100644
--- a/apps/meteor/tests/end-to-end/api/09-rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/09-rooms.ts
@@ -23,9 +23,7 @@ const drawioURL = './tests/e2e/fixtures/files/diagram.drawio';
 const svgLogoURL = './public/images/logo/logo.svg';
 const svgLogoFileName = 'logo.svg';
 
-describe('[Rooms]', function () {
-	this.retries(0);
-
+describe('[Rooms]', () => {
 	before((done) => getCredentials(done));
 
 	it('/rooms.get', (done) => {
diff --git a/apps/meteor/tests/end-to-end/api/10-subscriptions.ts b/apps/meteor/tests/end-to-end/api/10-subscriptions.ts
index 55ee3c8c421c..da7319602271 100644
--- a/apps/meteor/tests/end-to-end/api/10-subscriptions.ts
+++ b/apps/meteor/tests/end-to-end/api/10-subscriptions.ts
@@ -9,9 +9,7 @@ import { adminUsername } from '../../data/user';
 import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('[Subscriptions]', function () {
-	this.retries(0);
-
+describe('[Subscriptions]', () => {
 	before((done) => getCredentials(done));
 
 	let testChannel: IRoom;
diff --git a/apps/meteor/tests/end-to-end/api/11-permissions.ts b/apps/meteor/tests/end-to-end/api/11-permissions.ts
index ec4c55808754..55bd724dad45 100644
--- a/apps/meteor/tests/end-to-end/api/11-permissions.ts
+++ b/apps/meteor/tests/end-to-end/api/11-permissions.ts
@@ -4,9 +4,7 @@ import { before, describe, it, after } from 'mocha';
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { updatePermission } from '../../data/permissions.helper';
 
-describe('[Permissions]', function () {
-	this.retries(0);
-
+describe('[Permissions]', () => {
 	before((done) => getCredentials(done));
 
 	after(() => updatePermission('add-oauth-service', ['admin']));
diff --git a/apps/meteor/tests/end-to-end/api/12-emoji-custom.ts b/apps/meteor/tests/end-to-end/api/12-emoji-custom.ts
index 9b0a834a63fe..31042363836e 100644
--- a/apps/meteor/tests/end-to-end/api/12-emoji-custom.ts
+++ b/apps/meteor/tests/end-to-end/api/12-emoji-custom.ts
@@ -5,13 +5,11 @@ import { before, describe, it, after } from 'mocha';
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { imgURL } from '../../data/interactions';
 
-describe('[EmojiCustom]', function () {
+describe('[EmojiCustom]', () => {
 	const customEmojiName = `my-custom-emoji-${Date.now()}`;
 
 	let withoutAliases: ICustomEmojiDescriptor;
 
-	this.retries(0);
-
 	before((done) => getCredentials(done));
 
 	after(() =>
diff --git a/apps/meteor/tests/end-to-end/api/14-assets.ts b/apps/meteor/tests/end-to-end/api/14-assets.ts
index cc936f3b270b..ff9dbfa7a89f 100644
--- a/apps/meteor/tests/end-to-end/api/14-assets.ts
+++ b/apps/meteor/tests/end-to-end/api/14-assets.ts
@@ -5,9 +5,7 @@ import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { imgURL } from '../../data/interactions';
 import { updatePermission } from '../../data/permissions.helper';
 
-describe('[Assets]', function () {
-	this.retries(0);
-
+describe('[Assets]', () => {
 	before((done) => getCredentials(done));
 
 	before(() => updatePermission('manage-assets', ['admin']));
diff --git a/apps/meteor/tests/end-to-end/api/16-commands.ts b/apps/meteor/tests/end-to-end/api/16-commands.ts
index 5c877578b254..36a0842cc58f 100644
--- a/apps/meteor/tests/end-to-end/api/16-commands.ts
+++ b/apps/meteor/tests/end-to-end/api/16-commands.ts
@@ -10,9 +10,7 @@ import { password } from '../../data/user';
 import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('[Commands]', function () {
-	this.retries(0);
-
+describe('[Commands]', () => {
 	before((done) => getCredentials(done));
 
 	describe('[/commands.get]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/17-custom-sounds.ts b/apps/meteor/tests/end-to-end/api/17-custom-sounds.ts
index fb9dd5658458..11ba7622bfe0 100644
--- a/apps/meteor/tests/end-to-end/api/17-custom-sounds.ts
+++ b/apps/meteor/tests/end-to-end/api/17-custom-sounds.ts
@@ -7,9 +7,7 @@ import { before, describe, it, after } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 
-describe('[CustomSounds]', function () {
-	this.retries(0);
-
+describe('[CustomSounds]', () => {
 	before((done) => getCredentials(done));
 
 	describe('[/custom-sounds.list]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/17-custom-user-status.ts b/apps/meteor/tests/end-to-end/api/17-custom-user-status.ts
index f5b28e38e19a..c1ecd185dae8 100644
--- a/apps/meteor/tests/end-to-end/api/17-custom-user-status.ts
+++ b/apps/meteor/tests/end-to-end/api/17-custom-user-status.ts
@@ -3,9 +3,7 @@ import { before, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 
-describe('[CustomUserStatus]', function () {
-	this.retries(0);
-
+describe('[CustomUserStatus]', () => {
 	before((done) => getCredentials(done));
 
 	describe('[/custom-user-status.list]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/17-webdav.ts b/apps/meteor/tests/end-to-end/api/17-webdav.ts
index 097d91eec1cb..1dc2957fd6ba 100644
--- a/apps/meteor/tests/end-to-end/api/17-webdav.ts
+++ b/apps/meteor/tests/end-to-end/api/17-webdav.ts
@@ -3,9 +3,7 @@ import { before, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 
-describe('[Webdav]', function () {
-	this.retries(0);
-
+describe('[Webdav]', () => {
 	before((done) => getCredentials(done));
 
 	describe('/webdav.getMyAccounts', () => {
diff --git a/apps/meteor/tests/end-to-end/api/18-oauthapps.ts b/apps/meteor/tests/end-to-end/api/18-oauthapps.ts
index d576ea03483c..7bffa3297bfc 100644
--- a/apps/meteor/tests/end-to-end/api/18-oauthapps.ts
+++ b/apps/meteor/tests/end-to-end/api/18-oauthapps.ts
@@ -5,9 +5,8 @@ import { before, describe, it, after } from 'mocha';
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { updatePermission } from '../../data/permissions.helper';
 
-describe('[OAuthApps]', function () {
+describe('[OAuthApps]', () => {
 	const createdAppsIds: IOAuthApps['_id'][] = [];
-	this.retries(0);
 
 	before((done) => getCredentials(done));
 
diff --git a/apps/meteor/tests/end-to-end/api/19-statistics.ts b/apps/meteor/tests/end-to-end/api/19-statistics.ts
index e1b398bcbb15..c10eff929807 100644
--- a/apps/meteor/tests/end-to-end/api/19-statistics.ts
+++ b/apps/meteor/tests/end-to-end/api/19-statistics.ts
@@ -4,9 +4,7 @@ import { before, describe, it, after } from 'mocha';
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { updatePermission } from '../../data/permissions.helper';
 
-describe('[Statistics]', function () {
-	this.retries(0);
-
+describe('[Statistics]', () => {
 	before((done) => getCredentials(done));
 
 	after(() => updatePermission('view-statistics', ['admin']));
diff --git a/apps/meteor/tests/end-to-end/api/20-licenses.ts b/apps/meteor/tests/end-to-end/api/20-licenses.ts
index cd83cf725d65..7792d497fe1b 100644
--- a/apps/meteor/tests/end-to-end/api/20-licenses.ts
+++ b/apps/meteor/tests/end-to-end/api/20-licenses.ts
@@ -8,9 +8,8 @@ import { password } from '../../data/user';
 import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('licenses', function () {
+describe('licenses', () => {
 	let createdUser: TestUser<IUser>;
-	this.retries(0);
 
 	before((done) => getCredentials(done));
 	let unauthorizedUserCredentials: Credentials;
diff --git a/apps/meteor/tests/end-to-end/api/21-banners.ts b/apps/meteor/tests/end-to-end/api/21-banners.ts
index 8f05a71ef92d..a4fd2638e7dd 100644
--- a/apps/meteor/tests/end-to-end/api/21-banners.ts
+++ b/apps/meteor/tests/end-to-end/api/21-banners.ts
@@ -3,9 +3,7 @@ import { before, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 
-describe('banners', function () {
-	this.retries(0);
-
+describe('banners', () => {
 	before((done) => getCredentials(done));
 
 	describe('[/banners.getNew]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/22-push.ts b/apps/meteor/tests/end-to-end/api/22-push.ts
index 9fd8c1d78135..f496d0dfe9e9 100644
--- a/apps/meteor/tests/end-to-end/api/22-push.ts
+++ b/apps/meteor/tests/end-to-end/api/22-push.ts
@@ -4,9 +4,7 @@ import { before, describe, it, after } from 'mocha';
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { updateSetting } from '../../data/permissions.helper';
 
-describe('[Push]', function () {
-	this.retries(0);
-
+describe('[Push]', () => {
 	before((done) => getCredentials(done));
 
 	describe('POST [/push.token]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/23-invites.ts b/apps/meteor/tests/end-to-end/api/23-invites.ts
index 21b5cf5d19c4..85f0771f67d1 100644
--- a/apps/meteor/tests/end-to-end/api/23-invites.ts
+++ b/apps/meteor/tests/end-to-end/api/23-invites.ts
@@ -4,9 +4,8 @@ import { before, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 
-describe('Invites', function () {
+describe('Invites', () => {
 	let testInviteID: IInvite['_id'];
-	this.retries(0);
 
 	before((done) => getCredentials(done));
 	describe('POST [/findOrCreateInvite]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/24-methods.ts b/apps/meteor/tests/end-to-end/api/24-methods.ts
index 213c925c0645..d03b83854b28 100644
--- a/apps/meteor/tests/end-to-end/api/24-methods.ts
+++ b/apps/meteor/tests/end-to-end/api/24-methods.ts
@@ -13,9 +13,7 @@ import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 import { IS_EE } from '../../e2e/config/constants';
 
-describe('Meteor.methods', function () {
-	this.retries(0);
-
+describe('Meteor.methods', () => {
 	before((done) => getCredentials(done));
 
 	describe('[@getThreadMessages]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/26-LDAP.ts b/apps/meteor/tests/end-to-end/api/26-LDAP.ts
index 3d5a798ebd5c..fc5c9d127836 100644
--- a/apps/meteor/tests/end-to-end/api/26-LDAP.ts
+++ b/apps/meteor/tests/end-to-end/api/26-LDAP.ts
@@ -4,9 +4,7 @@ import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 
-describe('LDAP', function () {
-	this.retries(0);
-
+describe('LDAP', () => {
 	before((done) => getCredentials(done));
 
 	describe('[/ldap.syncNow]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/27-moderation.ts b/apps/meteor/tests/end-to-end/api/27-moderation.ts
index 9a8d6fad1b90..162b4c65c4bc 100644
--- a/apps/meteor/tests/end-to-end/api/27-moderation.ts
+++ b/apps/meteor/tests/end-to-end/api/27-moderation.ts
@@ -26,9 +26,7 @@ const reportUser = (userId: string, reason: string) => makeModerationApiRequest(
 
 const getUsersReports = (userId: string) => makeModerationApiRequest('moderation.user.reportsByUserId', 'get', { userId });
 
-describe('[Moderation]', function () {
-	this.retries(0);
-
+describe('[Moderation]', () => {
 	before((done) => getCredentials(done));
 
 	describe('[/moderation.reportsByUsers]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/27-presence.ts b/apps/meteor/tests/end-to-end/api/27-presence.ts
index ddef280c3433..a622ddeddfe4 100644
--- a/apps/meteor/tests/end-to-end/api/27-presence.ts
+++ b/apps/meteor/tests/end-to-end/api/27-presence.ts
@@ -7,9 +7,8 @@ import { updatePermission } from '../../data/permissions.helper';
 import { password } from '../../data/user';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('[Presence]', function () {
+describe('[Presence]', () => {
 	let createdUser: any;
-	this.retries(0);
 
 	before((done) => getCredentials(done));
 
diff --git a/apps/meteor/tests/end-to-end/api/28-roles.ts b/apps/meteor/tests/end-to-end/api/28-roles.ts
index 9caf6c222bdf..91f7a30ef2f5 100644
--- a/apps/meteor/tests/end-to-end/api/28-roles.ts
+++ b/apps/meteor/tests/end-to-end/api/28-roles.ts
@@ -4,9 +4,7 @@ import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 
-describe('[Roles]', function () {
-	this.retries(0);
-
+describe('[Roles]', () => {
 	const isEnterprise = Boolean(process.env.IS_EE);
 
 	before((done) => getCredentials(done));
diff --git a/apps/meteor/tests/end-to-end/api/29-oauth-server.ts b/apps/meteor/tests/end-to-end/api/29-oauth-server.ts
index e2dbde831afe..fcae24a2068a 100644
--- a/apps/meteor/tests/end-to-end/api/29-oauth-server.ts
+++ b/apps/meteor/tests/end-to-end/api/29-oauth-server.ts
@@ -4,9 +4,7 @@ import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 
-describe('[OAuth Server]', function () {
-	this.retries(0);
-
+describe('[OAuth Server]', () => {
 	let oAuthAppId: string;
 	let clientId: string;
 	let clientSecret: string;
diff --git a/apps/meteor/tests/end-to-end/api/30-calendar.ts b/apps/meteor/tests/end-to-end/api/30-calendar.ts
index 9422391f44b5..3ce9cb4159cb 100644
--- a/apps/meteor/tests/end-to-end/api/30-calendar.ts
+++ b/apps/meteor/tests/end-to-end/api/30-calendar.ts
@@ -8,9 +8,7 @@ import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { password } from '../../data/user';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('[Calendar Events]', function () {
-	this.retries(0);
-
+describe('[Calendar Events]', () => {
 	let user2: IUser;
 	let userCredentials: Credentials;
 
diff --git a/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts b/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts
index a8e1a867164d..ee0236c591b6 100644
--- a/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts
+++ b/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts
@@ -9,9 +9,7 @@ import { password } from '../../data/user';
 import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser } from '../../data/users.helper';
 
-describe('[Failed Login Attempts]', function () {
-	this.retries(0);
-
+describe('[Failed Login Attempts]', () => {
 	const maxAttemptsByUser = 2;
 	const maxAttemptsByIp = 4;
 	const userBlockSeconds = 3;
diff --git a/apps/meteor/tests/end-to-end/api/32-assets.ts b/apps/meteor/tests/end-to-end/api/32-assets.ts
index c7467887f59e..63de4dc955fa 100644
--- a/apps/meteor/tests/end-to-end/api/32-assets.ts
+++ b/apps/meteor/tests/end-to-end/api/32-assets.ts
@@ -2,9 +2,7 @@ import { describe, it } from 'mocha';
 
 import { request } from '../../data/api-data';
 
-describe('assets', function () {
-	this.retries(0);
-
+describe('assets', () => {
 	it('should always have CORS headers for assets', async () => {
 		await request.get('/assets/favicon.svg').expect('Content-Type', 'image/svg+xml').expect('Access-Control-Allow-Origin', '*').expect(200);
 
diff --git a/apps/meteor/tests/end-to-end/api/33-federation.ts b/apps/meteor/tests/end-to-end/api/33-federation.ts
index b44711d83291..9d832d9fc1ac 100644
--- a/apps/meteor/tests/end-to-end/api/33-federation.ts
+++ b/apps/meteor/tests/end-to-end/api/33-federation.ts
@@ -4,9 +4,7 @@ import { after, before, describe, it } from 'mocha';
 import { getCredentials, request } from '../../data/api-data';
 import { updateSetting } from '../../data/permissions.helper';
 
-describe('federation', function () {
-	this.retries(0);
-
+describe('federation', () => {
 	before((done) => getCredentials(done));
 
 	describe('well-known', () => {
diff --git a/apps/meteor/tests/end-to-end/api/import.spec.ts b/apps/meteor/tests/end-to-end/api/import.spec.ts
index 4a8d22b6207a..a3db33efff0d 100644
--- a/apps/meteor/tests/end-to-end/api/import.spec.ts
+++ b/apps/meteor/tests/end-to-end/api/import.spec.ts
@@ -6,9 +6,7 @@ import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { password } from '../../data/user';
 import { createUser, login, deleteUser } from '../../data/users.helper';
 
-describe('Imports', function () {
-	this.retries(0);
-
+describe('Imports', () => {
 	before((done) => getCredentials(done));
 
 	describe('[/getCurrentImportOperation]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
index 2cb054e4d88c..5c881b530d08 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
@@ -13,7 +13,7 @@ import type {
 } from '@rocket.chat/core-typings';
 import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { after, before, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
 import type { SuccessResult } from '../../../../app/api/server/definition';
@@ -64,8 +64,7 @@ const getSubscriptionForRoom = async (roomId: string, overrideCredential?: Crede
 	return subscription;
 };
 
-describe('LIVECHAT - rooms', function () {
-	this.retries(0);
+describe('LIVECHAT - rooms', () => {
 	let visitor: ILivechatVisitor;
 	let room: IOmnichannelRoom;
 
@@ -1995,7 +1994,7 @@ describe('LIVECHAT - rooms', function () {
 	(IS_EE ? describe : describe.skip)('livechat/room/:rid/priority', async () => {
 		let priorities: ILivechatPriority[];
 		let chosenPriority: ILivechatPriority;
-		this.afterAll(async () => {
+		after(async () => {
 			await updateEEPermission('manage-livechat-priorities', ['admin', 'livechat-manager']);
 			await updatePermission('view-l-room', ['admin', 'livechat-manager', 'livechat-agent']);
 		});
diff --git a/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts b/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts
index ba8bd58cf16d..fc81488ac37d 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts
@@ -22,8 +22,7 @@ import { updatePermission, updateSetting } from '../../../data/permissions.helpe
 import { password } from '../../../data/user';
 import { createUser, deleteUser, getMe, login, setUserStatus } from '../../../data/users.helper';
 
-describe('LIVECHAT - Agents', function () {
-	this.retries(0);
+describe('LIVECHAT - Agents', () => {
 	let agent: ILivechatAgent;
 	let manager: ILivechatAgent;
 
diff --git a/apps/meteor/tests/end-to-end/api/livechat/02-appearance.ts b/apps/meteor/tests/end-to-end/api/livechat/02-appearance.ts
index de2e81b370aa..030cdbd68f2d 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/02-appearance.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/02-appearance.ts
@@ -7,9 +7,7 @@ import { sleep } from '../../../data/livechat/utils';
 import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-describe('LIVECHAT - appearance', function () {
-	this.retries(0);
-
+describe('LIVECHAT - appearance', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/03-custom-fields.ts b/apps/meteor/tests/end-to-end/api/livechat/03-custom-fields.ts
index 5645392b1adc..75c1eaa62290 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/03-custom-fields.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/03-custom-fields.ts
@@ -7,9 +7,7 @@ import { createCustomField } from '../../../data/livechat/custom-fields';
 import { createVisitor } from '../../../data/livechat/rooms';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
 
-describe('LIVECHAT - custom fields', function () {
-	this.retries(0);
-
+describe('LIVECHAT - custom fields', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts b/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
index 0776451f195d..c0a559bbcba7 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
@@ -22,7 +22,6 @@ import { removePermissionFromAllRoles, restorePermissionToRoles, updateSetting }
 import { IS_EE } from '../../../e2e/config/constants';
 
 describe('LIVECHAT - dashboards', function () {
-	this.retries(0);
 	// This test is expected to take more time since we're simulating real time conversations to verify analytics
 	this.timeout(60000);
 
diff --git a/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts b/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts
index 1361064c62a9..8867d9c1b075 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts
@@ -22,9 +22,7 @@ import { password } from '../../../data/user';
 import { createUser, login, deleteUser } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-describe('LIVECHAT - inquiries', function () {
-	this.retries(0);
-
+describe('LIVECHAT - inquiries', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts b/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts
index 5d7165ff74b0..bc4d6fa04dc4 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts
@@ -6,9 +6,7 @@ import type { Response } from 'supertest';
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
 
-describe('LIVECHAT - Integrations', function () {
-	this.retries(0);
-
+describe('LIVECHAT - Integrations', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
index b0fc5e85b27e..1d5ef110d308 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
@@ -7,9 +7,7 @@ import type { Response } from 'supertest';
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
 
-describe('LIVECHAT - Queue', function () {
-	this.retries(0);
-
+describe('LIVECHAT - Queue', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/08-triggers.ts b/apps/meteor/tests/end-to-end/api/livechat/08-triggers.ts
index 92409c2c89d1..6168ed410f24 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/08-triggers.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/08-triggers.ts
@@ -7,9 +7,7 @@ import { createTrigger, fetchTriggers } from '../../../data/livechat/triggers';
 import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-describe('LIVECHAT - triggers', function () {
-	this.retries(0);
-
+describe('LIVECHAT - triggers', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
index 4f79d212fa82..5bc961087efc 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
@@ -25,8 +25,7 @@ const getLicenseInfo = (loadValues = false) => {
 	return request.get(api('licenses.info')).set(credentials).query({ loadValues }).expect(200);
 };
 
-describe('LIVECHAT - visitors', function () {
-	this.retries(0);
+describe('LIVECHAT - visitors', () => {
 	let visitor: ILivechatVisitor;
 
 	before((done) => getCredentials(done));
diff --git a/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts b/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
index e77eea3b7009..c07f7bcecc81 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
@@ -17,9 +17,7 @@ import { createBotAgent, getRandomVisitorToken } from '../../../data/livechat/us
 import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-describe('LIVECHAT - Utils', function () {
-	this.retries(0);
-
+describe('LIVECHAT - Utils', () => {
 	before((done) => getCredentials(done));
 
 	after(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts b/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts
index 3fb89278a7c1..7b80e2528629 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts
@@ -7,7 +7,7 @@ import type {
 } from '@rocket.chat/core-typings';
 import { OmnichannelSortingMechanismSettingType } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { after, before, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
 import { createDepartmentWithAnOnlineAgent } from '../../../data/livechat/department';
@@ -32,9 +32,7 @@ import {
 import { IS_EE } from '../../../e2e/config/constants';
 import { generateRandomSLAData } from '../../../e2e/utils/omnichannel/sla';
 
-(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - Priorities & SLAs', function () {
-	this.retries(0);
-
+(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - Priorities & SLAs', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
@@ -42,7 +40,7 @@ import { generateRandomSLAData } from '../../../e2e/utils/omnichannel/sla';
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
 	});
 
-	this.afterAll(async () => {
+	after(async () => {
 		await addPermissions({
 			'manage-livechat-priorities': ['admin', 'livechat-manager'],
 			'manage-livechat-sla': ['admin', 'livechat-manager'],
diff --git a/apps/meteor/tests/end-to-end/api/livechat/13-tags.ts b/apps/meteor/tests/end-to-end/api/livechat/13-tags.ts
index 0917c4fb43cb..7953e772c016 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/13-tags.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/13-tags.ts
@@ -12,9 +12,7 @@ import { password } from '../../../data/user';
 import { createUser, deleteUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-(IS_EE ? describe : describe.skip)('[EE] Livechat - Tags', function () {
-	this.retries(0);
-
+(IS_EE ? describe : describe.skip)('[EE] Livechat - Tags', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/14-units.ts b/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
index 3a03d9e93e2c..425c776fecdb 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
@@ -9,9 +9,7 @@ import { updatePermission, updateSetting } from '../../../data/permissions.helpe
 import { createUser, deleteUser } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - Units', function () {
-	this.retries(0);
-
+(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - Units', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/15-canned-responses.ts b/apps/meteor/tests/end-to-end/api/livechat/15-canned-responses.ts
index d4c9c758e5a0..a71925531f4d 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/15-canned-responses.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/15-canned-responses.ts
@@ -13,9 +13,7 @@ import { password } from '../../../data/user';
 import { createUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - Canned responses', function () {
-	this.retries(0);
-
+(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - Canned responses', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/16-video-call.ts b/apps/meteor/tests/end-to-end/api/livechat/16-video-call.ts
index 5f8d7492480f..4a3869aaed38 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/16-video-call.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/16-video-call.ts
@@ -5,9 +5,7 @@ import { getCredentials, api, request, credentials } from '../../../data/api-dat
 import { createLivechatRoom, createVisitor, fetchMessages, sendMessage } from '../../../data/livechat/rooms';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
 
-describe('LIVECHAT - WebRTC video call', function () {
-	this.retries(0);
-
+describe('LIVECHAT - WebRTC video call', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts b/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts
index 98c1bbe957a3..dc379eea9212 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts
@@ -17,9 +17,7 @@ import {
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - dashboards', function () {
-	this.retries(0);
-
+(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - dashboards', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts b/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts
index 3f2d1b51434e..43282ef9c79b 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts
@@ -23,9 +23,7 @@ import { password } from '../../../data/user';
 import { createUser, deleteUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - rooms', function () {
-	this.retries(0);
-
+(IS_EE ? describe : describe.skip)('[EE] LIVECHAT - rooms', () => {
 	before((done) => getCredentials(done));
 
 	let agent2: { user: IUser; credentials: Credentials };
diff --git a/apps/meteor/tests/end-to-end/api/livechat/19-business-hours.ts b/apps/meteor/tests/end-to-end/api/livechat/19-business-hours.ts
index 5e17e399eecf..9a6543f06c72 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/19-business-hours.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/19-business-hours.ts
@@ -32,9 +32,7 @@ import type { TestUser } from '../../../data/users.helper';
 import { setUserActiveStatus, createUser, deleteUser, getMe, getUserByUsername, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
-describe('LIVECHAT - business hours', function () {
-	this.retries(0);
-
+describe('LIVECHAT - business hours', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/methods/changeLivechatStatus.ts b/apps/meteor/tests/end-to-end/api/livechat/methods/changeLivechatStatus.ts
index 45e0292a320e..9067965f4d18 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/methods/changeLivechatStatus.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/methods/changeLivechatStatus.ts
@@ -11,9 +11,7 @@ import { updatePermission, updateSetting } from '../../../../data/permissions.he
 import { password } from '../../../../data/user';
 import { createUser, deleteUser, getMe, login } from '../../../../data/users.helper';
 
-describe('livechat:changeLivechatStatus', function () {
-	this.retries(0);
-
+describe('livechat:changeLivechatStatus', () => {
 	let agent: { user: IUser; credentials: Credentials };
 
 	before((done) => getCredentials(done));
diff --git a/apps/meteor/tests/end-to-end/apps/00-installation.ts b/apps/meteor/tests/end-to-end/apps/00-installation.ts
index 90e481364c8b..a3cfd3c17ce0 100644
--- a/apps/meteor/tests/end-to-end/apps/00-installation.ts
+++ b/apps/meteor/tests/end-to-end/apps/00-installation.ts
@@ -9,9 +9,7 @@ import { getUserByUsername } from '../../data/users.helper';
 
 const APP_USERNAME = 'appsrocketchattester.bot';
 
-describe('Apps - Installation', function () {
-	this.retries(0);
-
+describe('Apps - Installation', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => cleanupApps());
diff --git a/apps/meteor/tests/end-to-end/apps/01-send-messages.ts b/apps/meteor/tests/end-to-end/apps/01-send-messages.ts
index 7ee2fca01a36..9cfb9f2688d1 100644
--- a/apps/meteor/tests/end-to-end/apps/01-send-messages.ts
+++ b/apps/meteor/tests/end-to-end/apps/01-send-messages.ts
@@ -8,8 +8,7 @@ import { cleanupApps, installTestApp } from '../../data/apps/helper';
 import { getMessageById } from '../../data/chat.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
 
-describe('Apps - Send Messages As APP User', function () {
-	this.retries(0);
+describe('Apps - Send Messages As APP User', () => {
 	let app: App;
 
 	before((done) => getCredentials(done));
diff --git a/apps/meteor/tests/end-to-end/apps/02-send-messages-as-user.ts b/apps/meteor/tests/end-to-end/apps/02-send-messages-as-user.ts
index 8572a7d67137..401a011cecea 100644
--- a/apps/meteor/tests/end-to-end/apps/02-send-messages-as-user.ts
+++ b/apps/meteor/tests/end-to-end/apps/02-send-messages-as-user.ts
@@ -12,8 +12,7 @@ import { adminUsername, password } from '../../data/user';
 import type { TestUser } from '../../data/users.helper';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
-describe('Apps - Send Messages As User', function () {
-	this.retries(0);
+describe('Apps - Send Messages As User', () => {
 	let app: App;
 
 	before((done) => getCredentials(done));
diff --git a/apps/meteor/tests/end-to-end/apps/03-slash-command-test-simple.ts b/apps/meteor/tests/end-to-end/apps/03-slash-command-test-simple.ts
index 4774afdb2884..c74bcffaa4a2 100644
--- a/apps/meteor/tests/end-to-end/apps/03-slash-command-test-simple.ts
+++ b/apps/meteor/tests/end-to-end/apps/03-slash-command-test-simple.ts
@@ -5,9 +5,7 @@ import { after, before, describe, it } from 'mocha';
 import { getCredentials, request, credentials, api } from '../../data/api-data';
 import { cleanupApps, installTestApp } from '../../data/apps/helper';
 
-describe('Apps - Slash Command "test-simple"', function () {
-	this.retries(0);
-
+describe('Apps - Slash Command "test-simple"', () => {
 	before((done) => getCredentials(done));
 	before(async () => {
 		await cleanupApps();
diff --git a/apps/meteor/tests/end-to-end/apps/04-slash-command-test-with-arguments.ts b/apps/meteor/tests/end-to-end/apps/04-slash-command-test-with-arguments.ts
index b5a11efd9fee..4701ed3c4c85 100644
--- a/apps/meteor/tests/end-to-end/apps/04-slash-command-test-with-arguments.ts
+++ b/apps/meteor/tests/end-to-end/apps/04-slash-command-test-with-arguments.ts
@@ -5,9 +5,7 @@ import { after, before, describe, it } from 'mocha';
 import { getCredentials, request, credentials, api } from '../../data/api-data';
 import { cleanupApps, installTestApp } from '../../data/apps/helper';
 
-describe('Apps - Slash Command "test-with-arguments"', function () {
-	this.retries(0);
-
+describe('Apps - Slash Command "test-with-arguments"', () => {
 	before((done) => getCredentials(done));
 	before(async () => {
 		await cleanupApps();
diff --git a/apps/meteor/tests/end-to-end/apps/05-video-conferences.ts b/apps/meteor/tests/end-to-end/apps/05-video-conferences.ts
index 16ae82267641..8d29eee97b7d 100644
--- a/apps/meteor/tests/end-to-end/apps/05-video-conferences.ts
+++ b/apps/meteor/tests/end-to-end/apps/05-video-conferences.ts
@@ -8,9 +8,7 @@ import { updateSetting } from '../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
 import { adminUsername } from '../../data/user';
 
-describe('Apps - Video Conferences', function () {
-	this.retries(0);
-
+describe('Apps - Video Conferences', () => {
 	before((done) => getCredentials(done));
 
 	const roomName = `apps-e2etest-room-${Date.now()}-videoconf`;
diff --git a/apps/meteor/tests/end-to-end/apps/apps-uninstall.ts b/apps/meteor/tests/end-to-end/apps/apps-uninstall.ts
index 2fc5944cbc3d..e51bbb31bd96 100644
--- a/apps/meteor/tests/end-to-end/apps/apps-uninstall.ts
+++ b/apps/meteor/tests/end-to-end/apps/apps-uninstall.ts
@@ -6,8 +6,7 @@ import { getCredentials, request, credentials } from '../../data/api-data';
 import { apps } from '../../data/apps/apps-data';
 import { installTestApp, cleanupApps } from '../../data/apps/helper';
 
-describe('Apps - Uninstall', function () {
-	this.retries(0);
+describe('Apps - Uninstall', () => {
 	let app: App;
 
 	before((done) => getCredentials(done));