Skip to content

Commit 8bafa16

Browse files
authored
Missing awaits on floating promises in tests. (#359)
If you add `"no-floating-promises": true` it's very easy to find where this is done accidentally. Not sure we can keep that on all the time yet though..
1 parent a2d919b commit 8bafa16

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

test/integration/banListTest.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe("Test: Updating the PolicyList", function() {
3333
const moderator = await newTestUser(this.config.homeserverUrl, { name: { contains: "moderator" } });
3434
const banListId = await mjolnir.client.createRoom({ invite: [await moderator.getUserId()] });
3535
const banList = new PolicyList(banListId, banListId, mjolnir.client);
36-
mjolnir.client.setUserPowerLevel(await moderator.getUserId(), banListId, 100);
36+
await mjolnir.client.setUserPowerLevel(await moderator.getUserId(), banListId, 100);
3737

3838
assert.equal(banList.allRules.length, 0);
3939

@@ -124,7 +124,7 @@ describe("Test: Updating the PolicyList", function() {
124124
const moderator = await newTestUser(this.config.homeserverUrl, { name: { contains: "moderator" }} );
125125
const banListId = await mjolnir.client.createRoom({ invite: [await moderator.getUserId()] });
126126
const banList = new PolicyList(banListId, banListId, mjolnir.client);
127-
mjolnir.client.setUserPowerLevel(await moderator.getUserId(), banListId, 100);
127+
await mjolnir.client.setUserPowerLevel(await moderator.getUserId(), banListId, 100);
128128

129129
const entity = '@old:localhost:9999';
130130
let originalEventId = await createPolicyRule(mjolnir.client, banListId, 'm.room.rule.user', entity, '');
@@ -145,7 +145,7 @@ describe("Test: Updating the PolicyList", function() {
145145
const moderator = await newTestUser(this.config.homeserverUrl, { name: { contains: "moderator" } });
146146
const banListId = await mjolnir.client.createRoom({ invite: [await moderator.getUserId()] });
147147
const banList = new PolicyList(banListId, banListId, mjolnir.client);
148-
mjolnir.client.setUserPowerLevel(await moderator.getUserId(), banListId, 100);
148+
await mjolnir.client.setUserPowerLevel(await moderator.getUserId(), banListId, 100);
149149

150150
const entity = '@old:localhost:9999';
151151
let originalEventId = await createPolicyRule(mjolnir.client, banListId, 'm.room.rule.user', entity, '');
@@ -233,7 +233,7 @@ describe('Test: ACL updates will batch when rules are added in succession.', fun
233233
const mjolnir: Mjolnir = this.mjolnir!
234234
const serverName: string = new UserID(await mjolnir.client.getUserId()).domain
235235
const moderator = await newTestUser(this.config.homeserverUrl, { name: { contains: "moderator" } });
236-
moderator.joinRoom(this.mjolnir.client.managementRoomId);
236+
await moderator.joinRoom(mjolnir.managementRoomId);
237237
const mjolnirId = await mjolnir.client.getUserId();
238238

239239
// Setup some protected rooms so we can check their ACL state later.
@@ -256,8 +256,8 @@ describe('Test: ACL updates will batch when rules are added in succession.', fun
256256

257257
// Flood the watched list with banned servers, which should prompt Mjolnir to update server ACL in protected rooms.
258258
const banListId = await moderator.createRoom({ invite: [mjolnirId] });
259-
mjolnir.client.joinRoom(banListId);
260-
mjolnir.watchList(Permalinks.forRoom(banListId));
259+
await mjolnir.client.joinRoom(banListId);
260+
await mjolnir.watchList(Permalinks.forRoom(banListId));
261261
const acl = new ServerAcl(serverName).denyIpAddresses().allowServer("*");
262262
const evilServerCount = 200;
263263
for (let i = 0; i < evilServerCount; i++) {
@@ -373,7 +373,7 @@ describe('Test: should apply bans to the most recently active rooms first', func
373373
const mjolnir: Mjolnir = this.mjolnir!
374374
const serverName: string = new UserID(await mjolnir.client.getUserId()).domain
375375
const moderator = await newTestUser(this.config.homeserverUrl, { name: { contains: "moderator" } });
376-
moderator.joinRoom(mjolnir.managementRoomId);
376+
await moderator.joinRoom(mjolnir.managementRoomId);
377377
const mjolnirId = await mjolnir.client.getUserId();
378378

379379
// Setup some protected rooms so we can check their ACL state later.
@@ -395,8 +395,8 @@ describe('Test: should apply bans to the most recently active rooms first', func
395395

396396
// Flood the watched list with banned servers, which should prompt Mjolnir to update server ACL in protected rooms.
397397
const banListId = await moderator.createRoom({ invite: [mjolnirId] });
398-
mjolnir.client.joinRoom(banListId);
399-
mjolnir.watchList(Permalinks.forRoom(banListId));
398+
await mjolnir.client.joinRoom(banListId);
399+
await mjolnir.watchList(Permalinks.forRoom(banListId));
400400

401401
await mjolnir.syncLists();
402402

test/integration/roomMembersTest.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { newTestUser } from "./clientHelper";
55
import { getFirstReply, getNthReply } from "./commands/commandUtils";
66

77
describe("Test: Testing RoomMemberManager", function() {
8-
it("RoomMemberManager counts correctly when we call handleEvent manually", function() {
8+
it("RoomMemberManager counts correctly when we call handleEvent manually", async function() {
99
let manager: RoomMemberManager = this.mjolnir.roomJoins;
1010
let start = new Date(Date.now() - 100_000_000);
1111
const ROOMS = [
@@ -30,7 +30,7 @@ describe("Test: Testing RoomMemberManager", function() {
3030
membership: "join"
3131
}
3232
};
33-
manager.handleEvent(ROOMS[i % ROOMS.length], event, joinDate(i));
33+
await manager.handleEvent(ROOMS[i % ROOMS.length], event, joinDate(i));
3434
}
3535

3636
{
@@ -71,8 +71,8 @@ describe("Test: Testing RoomMemberManager", function() {
7171
}
7272
}
7373
};
74-
manager.handleEvent(ROOMS[0], event, leaveDate(i));
75-
manager.handleEvent(ROOMS[1], event, leaveDate(i));
74+
await manager.handleEvent(ROOMS[0], event, leaveDate(i));
75+
await manager.handleEvent(ROOMS[1], event, leaveDate(i));
7676
}
7777

7878
// Let's see if we have properly updated the joins/leaves
@@ -120,7 +120,7 @@ describe("Test: Testing RoomMemberManager", function() {
120120
}
121121
};
122122
const room = ROOMS[i * 9 % 2];
123-
manager.handleEvent(room, event, rejoinDate(i * 9));
123+
await manager.handleEvent(room, event, rejoinDate(i * 9));
124124
}
125125

126126
// Let's see if we have properly updated the joins/leaves

0 commit comments

Comments
 (0)