yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Flaky groups test (#5789)

Browse Source
This commit is contained in:
Tom Moor
2023-09-06 18:29:30 -04:00
committed by GitHub
parent ec0564eb32
commit d1de5871de
7 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
server/routes/api/groups/groups.test.ts
View File

@@ -147,11 +147,11 @@ describe("#groups.list", () => {
});
const body = await res.json();
expect(res.status).toEqual(200);
expect(body.data["groups"].length).toEqual(1);
expect(body.data["groups"][0].id).toEqual(group.id);
expect(body.data["groupMemberships"].length).toEqual(1);
expect(body.data["groupMemberships"][0].groupId).toEqual(group.id);
expect(body.data["groupMemberships"][0].user.id).toEqual(user.id);
expect(body.data.groups.length).toEqual(1);
expect(body.data.groups[0].id).toEqual(group.id);
expect(body.data.groupMemberships.length).toEqual(1);
expect(body.data.groupMemberships[0].groupId).toEqual(group.id);
expect(body.data.groupMemberships[0].user.id).toEqual(user.id);
expect(body.policies.length).toEqual(1);
expect(body.policies[0].abilities.read).toEqual(true);
});
@@ -182,11 +182,11 @@ describe("#groups.list", () => {
});
const body = await res.json();
expect(res.status).toEqual(200);
expect(body.data["groups"].length).toEqual(1);
expect(body.data["groups"][0].id).toEqual(group.id);
expect(body.data["groupMemberships"].length).toEqual(1);
expect(body.data["groupMemberships"][0].groupId).toEqual(group.id);
expect(body.data["groupMemberships"][0].user.id).toEqual(me.id);
expect(body.data.groups.length).toEqual(1);
expect(body.data.groups[0].id).toEqual(group.id);
expect(body.data.groupMemberships.length).toEqual(1);
expect(body.data.groupMemberships[0].groupId).toEqual(group.id);
expect(body.data.groupMemberships[0].user.id).toEqual(me.id);
expect(body.policies.length).toEqual(1);
expect(body.policies[0].abilities.read).toEqual(true);
});
@@ -217,34 +217,46 @@ describe("#groups.list", () => {
token: user.getJwtToken(),
},
});
const body = await res.json();
expect(res.status).toEqual(200);
expect(body.data.groups.length).toEqual(2);
expect(body.data.groups[0].id).toEqual(anotherGroup.id);
expect(body.data.groups[1].id).toEqual(group.id);
expect(body.data.groupMemberships.length).toEqual(2);
expect(body.data.groupMemberships[0].groupId).toEqual(group.id);
expect(body.data.groupMemberships[1].groupId).toEqual(group.id);
expect(
body.data.groupMemberships.map((u: any) => u.user.id).includes(user.id)
).toBe(true);
expect(
body.data.groupMemberships
.map((u: any) => u.user.id)
.includes(anotherUser.id)
).toBe(true);
expect(body.policies.length).toEqual(2);
const anotherRes = await server.post("/api/groups.list", {
body: {
userId: user.id,
token: user.getJwtToken(),
},
});
const body = await res.json();
const anotherBody = await anotherRes.json();
expect(res.status).toEqual(200);
expect(anotherRes.status).toEqual(200);
expect(body.data["groups"].length).toEqual(2);
expect(body.data["groups"][0].id).toEqual(anotherGroup.id);
expect(body.data["groups"][1].id).toEqual(group.id);
expect(body.data["groupMemberships"].length).toEqual(2);
expect(anotherBody.data["groups"].length).toEqual(1);
expect(anotherBody.data["groups"][0].id).toEqual(group.id);
expect(anotherBody.data["groupMemberships"].length).toEqual(2);
expect(body.data["groupMemberships"][0].groupId).toEqual(group.id);
expect(body.data["groupMemberships"][1].groupId).toEqual(group.id);
expect(body.data["groupMemberships"][0].user.id).toEqual(user.id);
expect(body.data["groupMemberships"][1].user.id).toEqual(anotherUser.id);
expect(anotherBody.data["groupMemberships"][0].groupId).toEqual(group.id);
expect(anotherBody.data["groupMemberships"][1].groupId).toEqual(group.id);
expect(anotherBody.data["groupMemberships"][0].user.id).toEqual(user.id);
expect(anotherBody.data["groupMemberships"][1].user.id).toEqual(
anotherUser.id
);
expect(body.policies.length).toEqual(2);
expect(anotherBody.data.groups.length).toEqual(1);
expect(anotherBody.data.groups[0].id).toEqual(group.id);
expect(anotherBody.data.groupMemberships.length).toEqual(2);
expect(anotherBody.data.groupMemberships[0].groupId).toEqual(group.id);
expect(anotherBody.data.groupMemberships[1].groupId).toEqual(group.id);
expect(
body.data.groupMemberships.map((u: any) => u.user.id).includes(user.id)
).toBe(true);
expect(
body.data.groupMemberships
.map((u: any) => u.user.id)
.includes(anotherUser.id)
).toBe(true);
});
});