Skip to content

Commit 402aad3

Browse files
nazabucciarellinazabucciarelli
committed
change websocket variables naming
1 parent c75d663 commit 402aad3

2 files changed

Lines changed: 42 additions & 38 deletions

File tree

‎apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,10 +1553,10 @@ describe('LIVECHAT - rooms', () => {
15531553
await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
15541554
await updateSetting('Livechat_enabled_when_agent_idle', false);
15551555
const { department: initialDepartment } = await createDepartmentWithAnOnlineAgent();
1556-
const { department: forwardToOfflineDepartment, ws } = await createDepartmentWithAnAwayAgent({
1556+
const { department: forwardToOfflineDepartment, ws: awayAgentWebSocket } = await createDepartmentWithAnAwayAgent({
15571557
allowReceiveForwardOffline: true,
15581558
});
1559-
sockets.push(ws);
1559+
sockets.push(awayAgentWebSocket);
15601560

15611561
const newVisitor = await createVisitor(initialDepartment._id);
15621562
const newRoom = await createLivechatRoom(newVisitor.token);
@@ -1682,8 +1682,10 @@ describe('LIVECHAT - rooms', () => {
16821682
async () => {
16831683
await updateSetting('Livechat_Routing_Method', 'Auto_Selection');
16841684
const { department: initialDepartment } = await createDepartmentWithAnOnlineAgent();
1685-
const { department: forwardToOfflineDepartment, ws } = await createDepartmentWithAnAwayAgent({ allowReceiveForwardOffline: true });
1686-
sockets.push(ws);
1685+
const { department: forwardToOfflineDepartment, ws: awayAgentWebSocket } = await createDepartmentWithAnAwayAgent({
1686+
allowReceiveForwardOffline: true,
1687+
});
1688+
sockets.push(awayAgentWebSocket);
16871689

16881690
const newVisitor = await createVisitor(initialDepartment._id);
16891691
const newRoom = await createLivechatRoom(newVisitor.token);
@@ -1722,8 +1724,10 @@ describe('LIVECHAT - rooms', () => {
17221724
async () => {
17231725
await updateSetting('Livechat_Routing_Method', 'Auto_Selection');
17241726
const { department: initialDepartment } = await createDepartmentWithAnOnlineAgent();
1725-
const { department: forwardToOfflineDepartment, ws } = await createDepartmentWithAnAwayAgent({ allowReceiveForwardOffline: false });
1726-
sockets.push(ws);
1727+
const { department: forwardToOfflineDepartment, ws: awayAgentWebSocket } = await createDepartmentWithAnAwayAgent({
1728+
allowReceiveForwardOffline: false,
1729+
});
1730+
sockets.push(awayAgentWebSocket);
17271731

17281732
const newVisitor = await createVisitor(initialDepartment._id);
17291733
const newRoom = await createLivechatRoom(newVisitor.token);
@@ -1803,11 +1807,11 @@ describe('LIVECHAT - rooms', () => {
18031807
const {
18041808
department: forwardToOfflineDepartment,
18051809
agent,
1806-
ws,
1810+
ws: awayAgentWebSocket,
18071811
} = await createDepartmentWithAnAwayAgent({
18081812
allowReceiveForwardOffline: true,
18091813
});
1810-
sockets.push(ws);
1814+
sockets.push(awayAgentWebSocket);
18111815
const newVisitor = await createVisitor(initialDepartment._id);
18121816
const newRoom = await createLivechatRoom(newVisitor.token);
18131817

‎apps/meteor/tests/end-to-end/api/livechat/24-routing.ts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -356,13 +356,13 @@ import { IS_EE } from '../../../e2e/config/constants';
356356
it('should not route to an idle user', async () => {
357357
await updateSetting('Livechat_enabled_when_agent_idle', false);
358358
await setUserStatus(testUser.credentials, UserStatus.AWAY);
359-
const ws1 = await ddpLogin(testUser.credentials['X-Auth-Token']);
360-
sockets.push(ws1);
361-
await setUserAwayWS(ws1);
359+
const firstAwayUserWebSocket = await ddpLogin(testUser.credentials['X-Auth-Token']);
360+
sockets.push(firstAwayUserWebSocket);
361+
await setUserAwayWS(firstAwayUserWebSocket);
362362
await setUserStatus(testUser3.credentials, UserStatus.AWAY);
363-
const ws2 = await ddpLogin(testUser3.credentials['X-Auth-Token']);
364-
sockets.push(ws2);
365-
await setUserAwayWS(ws2);
363+
const secondAwayUserWebSocket = await ddpLogin(testUser3.credentials['X-Auth-Token']);
364+
sockets.push(secondAwayUserWebSocket);
365+
await setUserAwayWS(secondAwayUserWebSocket);
366366

367367
// Agent is available but should be ignored
368368
await switchLivechatStatus('available', testUser.credentials);
@@ -514,13 +514,13 @@ import { IS_EE } from '../../../e2e/config/constants';
514514
it('should not route to an idle user', async () => {
515515
await updateSetting('Livechat_enabled_when_agent_idle', false);
516516
await setUserStatus(testUser.credentials, UserStatus.AWAY);
517-
const ws1 = await ddpLogin(testUser.credentials['X-Auth-Token']);
518-
sockets.push(ws1);
519-
await setUserAwayWS(ws1);
517+
const firstAwayUserWebSocket = await ddpLogin(testUser.credentials['X-Auth-Token']);
518+
sockets.push(firstAwayUserWebSocket);
519+
await setUserAwayWS(firstAwayUserWebSocket);
520520
await setUserStatus(testUser2.credentials, UserStatus.AWAY);
521-
const ws2 = await ddpLogin(testUser2.credentials['X-Auth-Token']);
522-
sockets.push(ws2);
523-
await setUserAwayWS(ws2);
521+
const secondAwayUserWebSocket = await ddpLogin(testUser2.credentials['X-Auth-Token']);
522+
sockets.push(secondAwayUserWebSocket);
523+
await setUserAwayWS(secondAwayUserWebSocket);
524524

525525
// Agent is available but should be ignored
526526
await switchLivechatStatus('available', testUser.credentials);
@@ -534,13 +534,13 @@ import { IS_EE } from '../../../e2e/config/constants';
534534
it('should route to agents even if theyre idle when setting is enabled', async () => {
535535
await updateSetting('Livechat_enabled_when_agent_idle', true);
536536
await setUserStatus(testUser.credentials, UserStatus.AWAY);
537-
const ws1 = await ddpLogin(testUser.credentials['X-Auth-Token']);
538-
sockets.push(ws1);
539-
await setUserAwayWS(ws1);
537+
const firstAwayUserWebSocket = await ddpLogin(testUser.credentials['X-Auth-Token']);
538+
sockets.push(firstAwayUserWebSocket);
539+
await setUserAwayWS(firstAwayUserWebSocket);
540540
await setUserStatus(testUser2.credentials, UserStatus.AWAY);
541-
const ws2 = await ddpLogin(testUser2.credentials['X-Auth-Token']);
542-
sockets.push(ws2);
543-
await setUserAwayWS(ws2);
541+
const secondAwayUserWebSocket = await ddpLogin(testUser2.credentials['X-Auth-Token']);
542+
sockets.push(secondAwayUserWebSocket);
543+
await setUserAwayWS(secondAwayUserWebSocket);
544544

545545
const visitor = await createVisitor(testDepartment._id);
546546
const room = await createLivechatRoom(visitor.token);
@@ -633,13 +633,13 @@ import { IS_EE } from '../../../e2e/config/constants';
633633
it('should not route to an idle user', async () => {
634634
await updateSetting('Livechat_enabled_when_agent_idle', false);
635635
await setUserStatus(testUser.credentials, UserStatus.AWAY);
636-
const ws1 = await ddpLogin(testUser.credentials['X-Auth-Token']);
637-
sockets.push(ws1);
638-
await setUserAwayWS(ws1);
636+
const firstAwayUserWebSocket = await ddpLogin(testUser.credentials['X-Auth-Token']);
637+
sockets.push(firstAwayUserWebSocket);
638+
await setUserAwayWS(firstAwayUserWebSocket);
639639
await setUserStatus(testUser2.credentials, UserStatus.AWAY);
640-
const ws2 = await ddpLogin(testUser2.credentials['X-Auth-Token']);
641-
sockets.push(ws2);
642-
await setUserAwayWS(ws2);
640+
const secondAwayUserWebSocket = await ddpLogin(testUser2.credentials['X-Auth-Token']);
641+
sockets.push(secondAwayUserWebSocket);
642+
await setUserAwayWS(secondAwayUserWebSocket);
643643

644644
// Agent is available but should be ignored
645645
await switchLivechatStatus('available', testUser.credentials);
@@ -653,13 +653,13 @@ import { IS_EE } from '../../../e2e/config/constants';
653653
it('should route to agents even if theyre idle when setting is enabled', async () => {
654654
await updateSetting('Livechat_enabled_when_agent_idle', true);
655655
await setUserStatus(testUser.credentials, UserStatus.AWAY);
656-
const ws1 = await ddpLogin(testUser.credentials['X-Auth-Token']);
657-
sockets.push(ws1);
658-
await setUserAwayWS(ws1);
656+
const firstAwayUserWebSocket = await ddpLogin(testUser.credentials['X-Auth-Token']);
657+
sockets.push(firstAwayUserWebSocket);
658+
await setUserAwayWS(firstAwayUserWebSocket);
659659
await setUserStatus(testUser2.credentials, UserStatus.AWAY);
660-
const ws2 = await ddpLogin(testUser2.credentials['X-Auth-Token']);
661-
sockets.push(ws2);
662-
await setUserAwayWS(ws2);
660+
const secondAwayUserWebSocket = await ddpLogin(testUser2.credentials['X-Auth-Token']);
661+
sockets.push(secondAwayUserWebSocket);
662+
await setUserAwayWS(secondAwayUserWebSocket);
663663

664664
const visitor = await createVisitor(testDepartment._id);
665665
const room = await createLivechatRoom(visitor.token);

0 commit comments

Comments
 (0)