mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 15:33:12 +09:00
Fix banlist sync being broken
Fix the logic for determining which entries in the banlist changed being incorrect and causing the banlist sync to be broken. Add unit tests for the syncUserListsEventHandler to ensure it functions as exxpected.
This commit is contained in:
1 parent
450e27e001
commit
2e5333af29
3 files changed
+98
-9
No files matched your search
@@ -162,4 +162,85 @@ describe("Slave testing", function() {
|
||||
]));
|
||||
});
|
||||
});
|
||||
|
||||
describe("class Slave", function() {
|
||||
describe(".syncUserListsEventHandler()", function() {
|
||||
let mockSlave;
|
||||
beforeEach(function() {
|
||||
mockSlave = {
|
||||
adminlist: new Set(),
|
||||
whitelist: new Set(),
|
||||
banlist: new Map(),
|
||||
broadcasts: [],
|
||||
broadcastEventToInstance(message, event) {
|
||||
this.broadcasts.push(message["data"]);
|
||||
},
|
||||
syncUserListsEventHandler: slave._Slave.prototype.syncUserListsEventHandler,
|
||||
syncLists(adminlist, banlist, whitelist) {
|
||||
return this.syncUserListsEventHandler({ "data": {
|
||||
"adminlist": adminlist,
|
||||
"banlist": banlist,
|
||||
"whitelist": whitelist,
|
||||
}});
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
it("should broadcast new entries to adminlist", async function() {
|
||||
await mockSlave.syncLists(["admin1"], [], []);
|
||||
await mockSlave.syncLists(["admin1", "admin2"], [], []);
|
||||
|
||||
assert.deepEqual(mockSlave.broadcasts, [
|
||||
{ "name": "admin1", "admin": true },
|
||||
{ "name": "admin2", "admin": true },
|
||||
]);
|
||||
});
|
||||
|
||||
it("should broadcast removals from adminlist", async function() {
|
||||
mockSlave.adminlist.add("admin1").add("admin2");
|
||||
await mockSlave.syncLists(["admin1"], [], []);
|
||||
assert.deepEqual(mockSlave.broadcasts, [
|
||||
{ "name": "admin2", "admin": false },
|
||||
]);
|
||||
});
|
||||
|
||||
it("should broadcast new entries to whitelist", async function() {
|
||||
await mockSlave.syncLists([], [], ["player1"]);
|
||||
await mockSlave.syncLists([], [], ["player1", "player2"]);
|
||||
|
||||
assert.deepEqual(mockSlave.broadcasts, [
|
||||
{ "name": "player1", "whitelisted": true },
|
||||
{ "name": "player2", "whitelisted": true },
|
||||
]);
|
||||
});
|
||||
|
||||
it("should broadcast removals from whitelist", async function() {
|
||||
mockSlave.whitelist.add("player1").add("player2");
|
||||
await mockSlave.syncLists([], [], ["player1"]);
|
||||
|
||||
assert.deepEqual(mockSlave.broadcasts, [
|
||||
{ "name": "player2", "whitelisted": false },
|
||||
]);
|
||||
});
|
||||
|
||||
it("should broadcast new entries to banlist", async function() {
|
||||
await mockSlave.syncLists([], [["badie1", "greifing"]], []);
|
||||
await mockSlave.syncLists([], [["badie1", "greifing"], ["badie2", "annoying"]], []);
|
||||
|
||||
assert.deepEqual(mockSlave.broadcasts, [
|
||||
{ "name": "badie1", "banned": true, "reason": "greifing" },
|
||||
{ "name": "badie2", "banned": true, "reason": "annoying" },
|
||||
]);
|
||||
});
|
||||
|
||||
it("should broadcast removals to banlist", async function() {
|
||||
mockSlave.banlist.set("badie1", "greifing").set("badie2", "annoying");
|
||||
await mockSlave.syncLists([], [["badie1", "greifing"]], []);
|
||||
|
||||
assert.deepEqual(mockSlave.broadcasts, [
|
||||
{ "name": "badie2", "banned": false, "reason": "" },
|
||||
]);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user