review

RocketChat · Aug 8, 2024 · d5be75c · d5be75c
1 parent 1d47fb9
commit d5be75c
Showing 1 changed file with 28 additions and 29 deletions.
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
@@ -1001,42 +1001,41 @@ describe('LIVECHAT - rooms', () => {
 			roomId = newRoom._id;
 			visitorToken = newVisitor.token;
 		});
-		// Needs fixing
-		(IS_EE ? it : it.skip)('should correctly set fallback department', async () => {
-			await updateSetting('Livechat_Routing_Method', 'Auto_Selection');
+		describe('fallback department', () => {
+			let fallbackDepartment: Awaited<ReturnType<typeof createDepartmentWithAnOnlineAgent>>['department'];
+			let initialDepartment: Awaited<ReturnType<typeof createDepartmentWithAnOfflineAgent>>['department'];
+			before(async () => {
+				await updateSetting('Livechat_Routing_Method', 'Auto_Selection');
 
-			const { department: fallbackDeparment } = await createDepartmentWithAnOnlineAgent();
-			const { department: initialDepartment } = await createDepartmentWithAnOfflineAgent({
-				fallbackForwardDepartment: fallbackDeparment._id,
-			});
-			expect(initialDepartment.fallbackForwardDepartment).to.be.equal(fallbackDeparment._id);
+				fallbackDepartment = (await createDepartmentWithAnOnlineAgent()).department;
+				initialDepartment = (
+					await createDepartmentWithAnOfflineAgent({
+						fallbackForwardDepartment: fallbackDepartment._id,
+					})
+				).department;
 
-			await deleteDepartment(initialDepartment._id);
-			await deleteDepartment(fallbackDeparment._id);
-		});
-		// Needs fixing
-		(IS_EE ? it : it.skip)(
-			'should redirect chat to fallback department when all agents in the initial department are offline',
-			async () => {
-				await updateSetting('Livechat_Routing_Method', 'Auto_Selection');
+				expect(initialDepartment.fallbackForwardDepartment).to.be.equal(fallbackDepartment._id);
+			});
 
-				const { department: fallbackDeparment } = await createDepartmentWithAnOnlineAgent();
-				const { department: initialDepartment } = await createDepartmentWithAnOfflineAgent({
-					fallbackForwardDepartment: fallbackDeparment._id,
-				});
+			after(async () => {
+				await Promise.all([deleteDepartment(fallbackDepartment._id), deleteDepartment(initialDepartment._id)]);
+			});
 
-				const newVisitor = await createVisitor(initialDepartment._id);
-				const newRoom = await createLivechatRoom(newVisitor.token);
+			(IS_EE ? it : it.skip)(
+				'should redirect chat to fallback department when all agents in the initial department are offline',
+				async () => {
+					await updateSetting('Livechat_Routing_Method', 'Auto_Selection');
 
-				const latestRoom = await getLivechatRoomInfo(newRoom._id);
+					const newVisitor = await createVisitor(initialDepartment._id);
+					const newRoom = await createLivechatRoom(newVisitor.token);
 
-				expect(latestRoom).to.have.property('departmentId');
-				expect(latestRoom.departmentId).to.be.equal(fallbackDeparment._id);
+					const latestRoom = await getLivechatRoomInfo(newRoom._id);
 
-				await deleteDepartment(initialDepartment._id);
-				await deleteDepartment(fallbackDeparment._id);
-			},
-		);
+					expect(latestRoom).to.have.property('departmentId');
+					expect(latestRoom.departmentId).to.be.equal(fallbackDepartment._id);
+				},
+			);
+		});
 		(IS_EE ? it : it.skip)('system messages sent on transfer should be properly generated', async () => {
 			const messagesList = await fetchMessages(roomId, visitorToken);