Skip to content

Commit f9512c8

Browse files
fix user presence update from test users
1 parent d3fbcf9 commit f9512c8

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

apps/meteor/tests/data/livechat/users.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Random } from '@rocket.chat/random';
55

66
import { api, credentials, request } from '../api-data';
77
import { password } from '../user';
8-
import { createUser, login, setUserStatus } from '../users.helper';
8+
import { createUser, login, setUserAway, setUserStatus } from '../users.helper';
99
import { createAgent, makeAgentAvailable, makeAgentUnavailable } from './rooms';
1010

1111
export const createBotAgent = async (): Promise<{
@@ -102,6 +102,7 @@ export const createAnAwayAgent = async (): Promise<{
102102
await createAgent(agent.username);
103103
await makeAgentAvailable(createdUserCredentials);
104104
await setUserStatus(createdUserCredentials, UserStatus.AWAY);
105+
await setUserAway(createdUserCredentials);
105106

106107
return {
107108
credentials: createdUserCredentials,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2118,7 +2118,7 @@ describe('LIVECHAT - rooms', () => {
21182118
'should return a success message when transferred successfully to an offline department when the department accepts it',
21192119
async () => {
21202120
const { department: initialDepartment } = await createDepartmentWithAnOnlineAgent();
2121-
const { department: forwardToOfflineDepartment } = await createDepartmentWithAnOfflineAgent({ allowReceiveForwardOffline: true });
2121+
const { department: forwardToOfflineDepartment } = await createDepartmentWithAnAwayAgent({ allowReceiveForwardOffline: true });
21222122
initialDepartmentId = initialDepartment._id;
21232123
departmentForwardToId = forwardToOfflineDepartment._id;
21242124

ee/packages/presence/src/lib/processConnectionStatus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const processPresenceAndStatus = (
3636
userSessions: IUserSessionConnection[] = [],
3737
statusDefault = UserStatus.ONLINE,
3838
): { status: UserStatus; statusConnection: UserStatus } => {
39-
const statusConnection = userSessions.map((s) => s.status).reduce(processConnectionStatus, UserStatus.OFFLINE);
39+
const statusConnection = process.env.TEST_MODE ? statusDefault : userSessions.map((s) => s.status).reduce(processConnectionStatus, UserStatus.OFFLINE);
4040

4141
const status = processStatus(statusConnection, statusDefault);
4242

0 commit comments

Comments
 (0)