From f59625f7bdfaef32a9cf740edc97d2532b362e74 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 3 Jan 2019 22:24:24 -0700 Subject: [PATCH] Fix last active test Time is backwards from all the other tests: larger is older, so we want LessThanOrEqual. Also ensure all the power levels are the same to prevent the sort algorithm from running a PL ordering. --- test/components/views/rooms/MemberList-test.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/components/views/rooms/MemberList-test.js b/test/components/views/rooms/MemberList-test.js index 57adde1717..ae54ed42ea 100644 --- a/test/components/views/rooms/MemberList-test.js +++ b/test/components/views/rooms/MemberList-test.js @@ -170,7 +170,7 @@ describe('MemberList', () => { if (!groupChange) { if (isPresenceEnabled) { console.log("Comparing last active timestamp..."); - expect(userB.getLastActiveTs()).toBeGreaterThanOrEqual(userA.getLastActiveTs()); + expect(userB.getLastActiveTs()).toBeLessThanOrEqual(userA.getLastActiveTs()); groupChange = userA.getLastActiveTs() !== userB.getLastActiveTs(); } else { console.log("Skipping last active timestamp"); @@ -245,14 +245,17 @@ describe('MemberList', () => { const semiActiveUsers = [adminUsers[0]]; const inactiveUsers = [...moderatorUsers, ...adminUsers.slice(1), ...defaultUsers.slice(1)]; activeUsers.forEach((u) => { + u.powerLevel = 100; // set everyone to the same PL to avoid running that check u.user.lastPresenceTs = 1000; u.user.lastActiveAgo = 0; }); semiActiveUsers.forEach((u) => { + u.powerLevel = 100; u.user.lastPresenceTs = 1000; u.user.lastActiveAgo = 50; }); inactiveUsers.forEach((u) => { + u.powerLevel = 100; u.user.lastPresenceTs = 1000; u.user.lastActiveAgo = 100; });