fix(approvals-satisfied): correctly handle list of users from codeown…

…ers (#625)

* fix(approvals-satisfied): correctly handle list of users from codeowners

* Update approvals-satisfied.test.ts

* Update approvals-satisfied.ts

* lint

src/helpers/approvals-satisfied.ts

@@ -67,11 +67,11 @@ export const approvalsSatisfied = async ({
   );
 
   const codeOwnersEntrySatisfiesApprovals = async (entry: Pick<CodeOwnersEntry, 'owners'>) => {
-    const loginsLists = await map(entry.owners, async teamOrUser => {
-      if (isTeam(teamOrUser)) {
-        return await fetchTeamLogins(teamOrUser);
+    const loginsLists = await map(entry.owners, async teamOrUsers => {
+      if (isTeam(teamOrUsers)) {
+        return await fetchTeamLogins(teamOrUsers);
       } else {
-        return [teamOrUser];
+        return teamOrUsers.split(',');
       }
     });
     const codeOwnerLogins = uniq(loginsLists.flat());
@@ -94,7 +94,7 @@ export const approvalsSatisfied = async ({
 const createArtificialCodeOwnersEntry = ({ teams = [], users = [] }: { teams?: string[]; users?: string[] }) => [
   { owners: teams.concat(users) }
 ];
-const isTeam = (teamOrUser: string) => teamOrUser.includes('/');
+const isTeam = (teamOrUsers: string) => teamOrUsers.includes('/');
 const fetchTeamLogins = async (team: string) => {
   const { data } = await octokit.teams.listMembersInOrg({
     org: context.repo.owner,

test/helpers/approvals-satisfied.test.ts

@@ -514,4 +514,40 @@ describe('approvalsSatisfied', () => {
     });
     expect(result).toBe(true);
   });
+
+  it('should return true when passing comma-seperated list of users and approvals are met', async () => {
+    mockPagination({
+      data: [
+        {
+          state: 'APPROVED',
+          user: { login: 'user1' }
+        }
+      ]
+    });
+    const result = await approvalsSatisfied({
+      users: 'user1,user2',
+      pull_number: '12345'
+    });
+    expect(octokit.pulls.listReviews).toHaveBeenCalledWith({ pull_number: 12345, repo: 'repo', owner: 'owner', page: 1, per_page: 100 });
+    expect(getRequiredCodeOwnersEntries).not.toHaveBeenCalled();
+    expect(result).toBe(true);
+  });
+
+  it('should return false when passing comma-seperated list of users and approvals are not met', async () => {
+    mockPagination({
+      data: [
+        {
+          state: 'APPROVED',
+          user: { login: 'user3' }
+        }
+      ]
+    });
+    const result = await approvalsSatisfied({
+      users: 'user1,user2',
+      pull_number: '12345'
+    });
+    expect(octokit.pulls.listReviews).toHaveBeenCalledWith({ pull_number: 12345, repo: 'repo', owner: 'owner', page: 1, per_page: 100 });
+    expect(getRequiredCodeOwnersEntries).not.toHaveBeenCalled();
+    expect(result).toBe(false);
+  });
 });