test: fixed test for user limits

ubiquity-os-marketplace · Jan 4, 2025 · 46b5c2d · 46b5c2d
1 parent 3d1db38
commit 46b5c2d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/src/types/plugin-input.ts b/src/types/plugin-input.ts
@@ -16,7 +16,7 @@ export enum Role {
 // These correspond to getMembershipForUser and getCollaboratorPermissionLevel for a user.
 // Anything outside these values is considered to be a contributor (external user).
 export const ADMIN_ROLES = ["admin", "owner", "billing_manager"];
-export const COLLABORATOR_ROLES = ["write", "member"];
+export const COLLABORATOR_ROLES = ["write", "member", "collaborator"];
 
 const rolesWithReviewAuthority = T.Array(T.Enum(Role), {
   default: [Role.OWNER, Role.ADMIN, Role.MEMBER, Role.COLLABORATOR],

diff --git a/tests/main.test.ts b/tests/main.test.ts
@@ -20,27 +20,27 @@ type PayloadSender = Context["payload"]["sender"];
 
 const octokit = jest.requireActual("@octokit/rest");
 const TEST_REPO = "ubiquity/test-repo";
-const PRIORITY_ONE = { name: "Priority: 1 (Normal)", roles: ["admin", "member", "collaborator", "contributor", "owner", "billing_manager"] };
+const PRIORITY_ONE = { name: "Priority: 1 (Normal)", allowedRoles: ["collaborator", "contributor"] };
 const priority3LabelName = "Priority: 3 (High)";
 const priority4LabelName = "Priority: 4 (Urgent)";
 const priority5LabelName = "Priority: 5 (Emergency)";
 const PRIORITY_LABELS = [
   PRIORITY_ONE,
   {
     name: "Priority: 2 (Medium)",
-    roles: ["admin", "member", "collaborator", "contributor", "owner", "billing_manager"],
+    allowedRoles: ["collaborator", "contributor"],
   },
   {
     name: priority3LabelName,
-    roles: ["admin", "member", "collaborator", "contributor", "owner", "billing_manager"],
+    allowedRoles: ["collaborator", "contributor"],
   },
   {
     name: priority4LabelName,
-    roles: ["admin", "member", "collaborator", "contributor", "owner", "billing_manager"],
+    allowedRoles: ["collaborator", "contributor"],
   },
   {
     name: priority5LabelName,
-    roles: ["admin", "member", "collaborator", "contributor", "owner", "billing_manager"],
+    allowedRoles: ["collaborator", "contributor"],
   },
 ];
 
@@ -240,7 +240,7 @@ describe("User start/stop", () => {
     const issue = db.issue.findFirst({ where: { id: { equals: 1 } } }) as unknown as Issue;
     const sender = db.users.findFirst({ where: { id: { equals: 5 } } }) as unknown as Sender;
 
-    const memberLimit = maxConcurrentDefaults.member;
+    const memberLimit = maxConcurrentDefaults.collaborator;
 
     createIssuesForMaxAssignment(memberLimit + 4, sender.id);
     const context = createContext(issue, sender) as unknown as Context;
@@ -309,9 +309,9 @@ describe("User start/stop", () => {
     const sender = db.users.findFirst({ where: { id: { equals: 1 } } }) as unknown as PayloadSender;
 
     const context = createContext(issue, sender, "/start", "1", false, [
-      { name: priority3LabelName, roles: ["admin", "member", "collaborator", "contributor", "owner", "billing_manager"] },
-      { name: priority4LabelName, roles: ["admin", "member", "collaborator", "contributor", "owner", "billing_manager"] },
-      { name: priority5LabelName, roles: ["admin", "member", "collaborator", "contributor", "owner", "billing_manager"] },
+      { name: priority3LabelName, allowedRoles: ["collaborator", "contributor"] },
+      { name: priority4LabelName, allowedRoles: ["collaborator", "contributor"] },
+      { name: priority5LabelName, allowedRoles: ["collaborator", "contributor"] },
     ]) as Context<"issue_comment.created">;
 
     context.adapters = createAdapters(getSupabase(), context);
@@ -328,11 +328,11 @@ describe("User start/stop", () => {
     const sender = db.users.findFirst({ where: { id: { equals: 1 } } }) as unknown as PayloadSender;
 
     const context = createContext(issue, sender, "/start", "1", false, [
-      { name: "Priority: 1 (Normal)", roles: ["contributor"] },
-      { name: "Priority: 2 (Medium)", roles: ["contributor"] },
-      { name: priority3LabelName, roles: ["contributor"] },
-      { name: priority4LabelName, roles: ["contributor"] },
-      { name: priority5LabelName, roles: ["contributor"] },
+      { name: "Priority: 1 (Normal)", allowedRoles: ["contributor"] },
+      { name: "Priority: 2 (Medium)", allowedRoles: ["contributor"] },
+      { name: priority3LabelName, allowedRoles: ["contributor"] },
+      { name: priority4LabelName, allowedRoles: ["contributor"] },
+      { name: priority5LabelName, allowedRoles: ["contributor"] },
     ]) as Context<"issue_comment.created">;
 
     context.adapters = createAdapters(getSupabase(), context);
@@ -695,8 +695,7 @@ function createIssuesForMaxAssignment(n: number, userId: number) {
 }
 
 const maxConcurrentDefaults = {
-  admin: Infinity,
-  member: 6,
+  collaborator: 6,
   contributor: 4,
 };
 

diff --git a/tests/roles.test.ts b/tests/roles.test.ts
@@ -6,9 +6,8 @@ import { Context } from "../src/types";
 describe("Role tests", () => {
   it("Should retrieve the user role from organization", async () => {
     const maxConcurrentTasks = {
-      contributor: 2,
-      admin: 100,
-      read: 1,
+      collaborator: 2,
+      contributor: 1,
     };
     const ctx = {
       payload: {
@@ -36,7 +35,7 @@ describe("Role tests", () => {
     } as unknown as Context;
 
     let result = await getUserRoleAndTaskLimit(ctx, "ubiquity-os");
-    expect(result).toEqual({ limit: maxConcurrentTasks.admin, role: "admin" });
+    expect(result).toEqual({ limit: Infinity, role: "admin" });
     ctx.octokit = {
       rest: {
         repos: {
@@ -45,6 +44,6 @@ describe("Role tests", () => {
       },
     } as unknown as Context["octokit"];
     result = await getUserRoleAndTaskLimit(ctx, "ubiquity-os");
-    expect(result).toEqual({ limit: maxConcurrentTasks.read, role: "read" });
+    expect(result).toEqual({ limit: 1, role: "read" });
   });
 });