Fix tests

Author: mia-pi-git

server/roomlogs.ts

@@ -90,14 +90,17 @@ type RedisDriver = import('ioredis').Redis;
 
 export class RedisScrollback implements Scrollback {
 	room: BasicRoom;
-	static driver = require('ioredis').createClient(
-		Config.redis || Config.redislogs
-	) as RedisDriver;
+	static driver = RedisScrollback.getDriver()!;
 	gettingLog: Promise<string[]> | null = null;
 	logsWhileGetting: string[] | null = null;
 	constructor(room: BasicRoom) {
 		this.room = room;
 	}
+	static getDriver() {
+		const config = Config.redis || Config.redislogs;
+		if (!config) return;
+		return require('ioredis').createClient(config) as RedisDriver;
+	}
 	async add(message: string) {
 		await RedisScrollback.driver.lpush(`scrollback:${this.room.roomid}`, message);
 	}

test/server/chat-plugins/chat-monitor.js

@@ -50,11 +50,11 @@ describe('Chat monitor', () => {
 	});
 
 	describe('in-room tests', function () {
-		before(() => {
+		before(async () => {
 			this.room = Rooms.get('lobby');
 			this.user = makeUser("Unit Tester");
 			this.connection = this.user.connections[0];
-			this.user.joinRoom(this.room.roomid, this.connection);
+			await this.user.joinRoom(this.room.roomid, this.connection);
 
 			Chat.loadPlugins();
 			this.parse = async function (message) {
@@ -80,7 +80,8 @@ describe('Chat monitor', () => {
 			await this.parse("haha autolock me pls");
 
 			assert(this.user.locked);
-			assert.notEqual(this.room.log.log.pop(), "haha autolock me pls");
+			const log = [...await this.room.log.get()];
+			assert.notEqual(log.pop(), "haha autolock me pls");
 		});
 
 		it('should lock users who evade evasion phrases', async () => {
@@ -92,7 +93,8 @@ describe('Chat monitor', () => {
 
 			await this.parse("sl ur");
 			assert(this.user.locked);
-			assert.notEqual(this.room.log.log.pop(), "sl ur");
+			const log = [...await this.room.log.get()];
+			assert.notEqual(log.pop(), "sl ur");
 		});
 
 		it('should replace words filtered to other words', async () => {
@@ -104,8 +106,9 @@ describe('Chat monitor', () => {
 			});
 
 			await this.parse("Hello! replace me pls! thanks, and remember to replace me.");
+			const log = [...await this.room.log.get()];
 			assert.equal(
-				this.room.log.log.pop().replace(/^\|c:\|[0-9]+\| Unit Tester\|/, ''),
+				log.pop().replace(/^\|c:\|[0-9]+\| Unit Tester\|/, ''),
 				"Hello! i got replaced pls! thanks, and remember to i got replaced."
 			);
 		});
@@ -118,7 +121,9 @@ describe('Chat monitor', () => {
 			});
 
 			await this.parse("mild slur");
-			assert.notEqual(this.room.log.log.pop(), "mild slur");
+			// note: None of the log tests work. these check for things it can literally never be.
+			const log = [...await this.room.log.get()];
+			assert.notEqual(log.pop(), "mild slur");
 		});
 
 		it('should prevent banwords and evasion banwords from being used in usernames', () => {

test/server/chat-plugins/trivia.js

@@ -9,10 +9,10 @@ const FirstModeTrivia = trivia.FirstModeTrivia;
 const TimerModeTrivia = trivia.TimerModeTrivia;
 const NumberModeTrivia = trivia.NumberModeTrivia;
 
-function makeTriviaUser(name, ip) {
+async function makeTriviaUser(name, ip) {
 	const user = makeUser(name, ip);
 	assert.equal(Users.users.get(user.id), user);
-	user.joinRoom('trivia');
+	await user.joinRoom('trivia');
 	return user;
 }
 
@@ -29,10 +29,10 @@ describe('Trivia', function () {
 		this.room = Rooms.get('trivia');
 	});
 
-	beforeEach(function () {
+	beforeEach(async function () {
 		const questions = [{question: '', answers: ['answer'], category: 'ae'}];
-		this.user = makeTriviaUser('Morfent', '127.0.0.1');
-		this.tarUser = makeTriviaUser('ReallyNotMorfent', '127.0.0.2');
+		this.user = await makeTriviaUser('Morfent', '127.0.0.1');
+		this.tarUser = await makeTriviaUser('ReallyNotMorfent', '127.0.0.2');
 		this.game = this.room.game = new Trivia(this.room, 'first', ['ae'], true, 'short', questions);
 	});
 
@@ -64,24 +64,24 @@ describe('Trivia', function () {
 		assert.equal(this.game.playerCount, 1);
 	});
 
-	it('should not add a player if another one on the same IP has joined', function () {
+	it('should not add a player if another one on the same IP has joined', async function () {
 		this.game.addTriviaPlayer(this.user);
 
-		const user2 = makeTriviaUser('Not Morfent', '127.0.0.1');
+		const user2 = await makeTriviaUser('Not Morfent', '127.0.0.1');
 		assert.throws(() => this.game.addTriviaPlayer(user2));
 
 		assert.equal(this.game.playerCount, 1);
 		destroyUser(user2);
 	});
 
-	it('should not add a player if another player had their username previously', function () {
+	it('should not add a player if another player had their username previously', async function () {
 		const userid = this.user.id;
 		const name = this.user.name;
 		this.game.addTriviaPlayer(this.user);
 		this.user.forceRename('Not Morfent', true);
 		this.user.previousIDs.push(userid);
 
-		const user2 = makeTriviaUser(name, '127.0.0.3');
+		const user2 = await makeTriviaUser(name, '127.0.0.3');
 		assert.throws(() => this.game.addTriviaPlayer(user2));
 
 		assert.equal(this.game.playerCount, 1);
@@ -117,14 +117,14 @@ describe('Trivia', function () {
 		assert.equal(this.game.playerCount, 0);
 	});
 
-	it('should not add users who were kicked under another IP', function () {
+	it('should not add users who were kicked under another IP', async function () {
 		this.game.addTriviaPlayer(this.tarUser);
 		this.game.kick(this.tarUser, this.user);
 
 		const name = this.tarUser.name;
 		this.tarUser.resetName();
 
-		const user2 = makeTriviaUser(name, '127.0.0.2');
+		const user2 = await makeTriviaUser(name, '127.0.0.2');
 		assert.throws(() => this.game.addTriviaPlayer(user2));
 		assert.equal(this.game.playerCount, 0);
 		destroyUser(user2);
@@ -159,16 +159,14 @@ describe('Trivia', function () {
 			const questions = [null, null].fill({question: '', answers: ['answer'], category: 'ae'});
 			const game = new FirstModeTrivia(this.room, 'first', ['ae'], true, 'short', questions);
 
-			this.user = makeTriviaUser('Morfent', '127.0.0.1');
-			this.user2 = makeTriviaUser('user2', '127.0.0.2');
-			this.user3 = makeTriviaUser('user3', '127.0.0.3');
+			this.user = await makeTriviaUser('Morfent', '127.0.0.1');
+			this.user2 = await makeTriviaUser('user2', '127.0.0.2');
+			this.user3 = await makeTriviaUser('user3', '127.0.0.3');
 
-			this.user.joinRoom(this.room);
-			game.addTriviaPlayer(this.user);
-			this.user2.joinRoom(this.room);
-			game.addTriviaPlayer(this.user2);
-			this.user3.joinRoom(this.room);
-			game.addTriviaPlayer(this.user3);
+			for (const user of [this.user, this.user2, this.user3]) {
+				await user.joinRoom(this.room);
+				game.addTriviaPlayer(user);
+			}
 			game.start();
 			await game.askQuestion();
 			clearTimeout(game.phaseTimeout);
@@ -189,11 +187,11 @@ describe('Trivia', function () {
 			}
 		});
 
-		it('should mark a player absent on leave and unnmark them when they return', function () {
+		it('should mark a player absent on leave and unnmark them when they return', async function () {
 			this.user.leaveRoom(this.room);
 			assert.equal(this.player.isAbsent, true);
 
-			this.user.joinRoom(this.room);
+			await this.user.joinRoom(this.room);
 			assert.equal(this.player.isAbsent, false);
 		});
 	});
@@ -203,9 +201,9 @@ describe('Trivia', function () {
 			const questions = [{question: '', answers: ['answer'], category: 'ae'}];
 			const game = new FirstModeTrivia(this.room, 'first', ['ae'], true, 'short', questions);
 
-			this.user = makeTriviaUser('Morfent', '127.0.0.1');
-			this.user2 = makeTriviaUser('user2', '127.0.0.2');
-			this.user3 = makeTriviaUser('user3', '127.0.0.3');
+			this.user = await makeTriviaUser('Morfent', '127.0.0.1');
+			this.user2 = await makeTriviaUser('user2', '127.0.0.2');
+			this.user3 = await makeTriviaUser('user3', '127.0.0.3');
 
 			game.addTriviaPlayer(this.user);
 			game.addTriviaPlayer(this.user2);
@@ -267,9 +265,9 @@ describe('Trivia', function () {
 			const questions = [{question: '', answers: ['answer'], category: 'ae'}];
 			const game = new TimerModeTrivia(this.room, 'first', ['ae'], true, 'short', questions);
 
-			this.user = makeTriviaUser('Morfent', '127.0.0.1');
-			this.user2 = makeTriviaUser('user2', '127.0.0.2');
-			this.user3 = makeTriviaUser('user3', '127.0.0.3');
+			this.user = await makeTriviaUser('Morfent', '127.0.0.1');
+			this.user2 = await makeTriviaUser('user2', '127.0.0.2');
+			this.user3 = await makeTriviaUser('user3', '127.0.0.3');
 
 			game.addTriviaPlayer(this.user);
 			game.addTriviaPlayer(this.user2);
@@ -342,9 +340,9 @@ describe('Trivia', function () {
 			const questions = [{question: '', answers: ['answer'], category: 'ae'}];
 			const game = new NumberModeTrivia(this.room, 'first', ['ae'], true, 'short', questions);
 
-			this.user = makeTriviaUser('Morfent', '127.0.0.1');
-			this.user2 = makeTriviaUser('user2', '127.0.0.2');
-			this.user3 = makeTriviaUser('user3', '127.0.0.3');
+			this.user = await makeTriviaUser('Morfent', '127.0.0.1');
+			this.user2 = await makeTriviaUser('user2', '127.0.0.2');
+			this.user3 = await makeTriviaUser('user3', '127.0.0.3');
 
 			game.addTriviaPlayer(this.user);
 			game.addTriviaPlayer(this.user2);

test/server/punishments.js

@@ -81,10 +81,10 @@ describe('broader, more integrated Punishments tests', function () {
 	});
 
 	describe('room bans', () => {
-		before(() => {
+		before(async () => {
 			this.user = makeUser("Roomban Me Please", '127.0.0.8');
 			this.connection = this.user.connections[0];
-			this.user.joinRoom(this.room.roomid, this.connection);
+			await this.user.joinRoom(this.room.roomid, this.connection);
 		});
 
 		beforeEach(async () => Punishments.roomBan(this.room, this.user, Date.now() + TEST_PUNISHMENT_DURATION, this.user.id, false, 'test'));
@@ -111,25 +111,25 @@ describe('broader, more integrated Punishments tests', function () {
 	});
 
 	describe('locks (network) (slow)', () => {
-		before(() => {
+		before(async () => {
 			this.user = makeUser("Lock Me Please", '127.0.0.3');
 			this.connection = this.user.connections[0];
-			this.user.joinRoom(this.room.roomid, this.connection);
+			await this.user.joinRoom(this.room.roomid, this.connection);
 		});
 
 		beforeEach(async () => Punishments.lock(this.user, Date.now() + TEST_PUNISHMENT_DURATION, this.user.id, false, 'test'));
 		afterEach(() => Punishments.unlock(this.user.id));
 
 		it('should prevent users from chatting in rooms while they are locked', async () => {
-			const initialLogLength = this.room.log.log.length;
+			const initialLogLength = this.room.log.logLength;
 
 			await this.parse("Hi! I'm a locked user!");
-			assert.equal(this.room.log.log.length, initialLogLength, `user should be unable to sucessfully chat while locked`);
+			assert.equal(this.room.log.logLength, initialLogLength, `user should be unable to sucessfully chat while locked`);
 
 			Punishments.unlock(this.user.id);
 			await this.parse("/msgroom lobby,Hi! I'm no longer locked!");
 			// we can't just check the roomlog length because unlocking adds a |n| message to
-			const lastMessage = this.room.log.log.pop();
+			const lastMessage = (await this.room.log.get()).pop();
 			assert(lastMessage.endsWith(` Lock Me Please|Hi! I'm no longer locked!`), `user should have sucessfuly sent a message after being locked`);
 		});
 
@@ -171,10 +171,10 @@ describe('broader, more integrated Punishments tests', function () {
 	});
 
 	describe('namelocks (network) (slow)', () => {
-		before(() => {
+		before(async () => {
 			this.user = makeUser("Namelock Me Please", '127.0.0.6');
 			this.connection = this.user.connections[0];
-			this.user.joinRoom(this.room.roomid, this.connection);
+			await this.user.joinRoom(this.room.roomid, this.connection);
 		});
 
 		beforeEach(async () => Punishments.namelock(this.user, Date.now() + TEST_PUNISHMENT_DURATION, this.user.id, false, 'test'));
@@ -202,10 +202,10 @@ describe('broader, more integrated Punishments tests', function () {
 	});
 
 	describe('global bans (network) (slow)', () => {
-		before(() => {
+		before(async () => {
 			this.user = makeUser("Ban Me Please", '127.0.0.7');
 			this.connection = this.user.connections[0];
-			this.user.joinRoom(this.room.roomid, this.connection);
+			await this.user.joinRoom(this.room.roomid, this.connection);
 		});
 
 		beforeEach(async () => Punishments.ban(this.user, Date.now() + TEST_PUNISHMENT_DURATION, this.user.id, false, 'test'));

test/server/rooms.js

@@ -85,7 +85,7 @@ describe('Rooms features', function () {
 			assert.equal(room.auth.get(makeUser().id), '%');
 		});
 
-		it('should prevent overriding tournament room auth by a tournament player', function () {
+		it('should prevent overriding tournament room auth by a tournament player', async () => {
 			parent = Rooms.createChatRoom('parentroom2');
 			parent.auth.get = () => '%';
 			const p1 = makeUser();
@@ -110,8 +110,8 @@ describe('Rooms features', function () {
 					room: parent,
 				},
 			});
-			roomStaff.joinRoom(room);
-			administrator.joinRoom(room);
+			await roomStaff.joinRoom(room);
+			await administrator.joinRoom(room);
 			assert.equal(room.auth.get(roomStaff), '%', 'before promotion attempt');
 			Chat.parse("/roomvoice Room auth", room, p1, p1.connections[0]);
 			assert.equal(room.auth.get(roomStaff), '%', 'after promotion attempt');
@@ -154,7 +154,7 @@ describe('Rooms features', function () {
 			it("should move the users and their connections", async function () {
 				room = Rooms.createChatRoom("test", "Test");
 				const user = makeUser();
-				user.joinRoom(room);
+				await user.joinRoom(room);
 				await room.rename("Test2");
 				assert.equal(user.inRooms.has("test"), false);
 				assert.equal(user.inRooms.has("test2"), true);

test/server/users.js

@@ -170,10 +170,10 @@ describe('Users features', function () {
 					target.tempGroup = '&';
 					assert.equal(user.can('globalban', target), false, 'targeting higher rank');
 				});
-				it(`should not allow users to demote themselves`, function () {
+				it(`should not allow users to demote themselves`, async function () {
 					room = Rooms.createChatRoom("test");
 					const user = makeUser("User");
-					user.joinRoom(room);
+					await user.joinRoom(room);
 					for (const group of [' ', '+', '@']) {
 						room.auth.set(user.id, group);
 						assert.equal(room.auth.get(user.id), group, 'before demotion attempt');