From 456c74403a1430b5118a785bf3ec54fa9ae60096 Mon Sep 17 00:00:00 2001
From: Francesco Saltori <francescosaltori@gmail.com>
Date: Tue, 24 May 2022 15:34:15 +0200
Subject: [PATCH] Update test for adding collaborators

Signed-off-by: Francesco Saltori <francescosaltori@gmail.com>
---
 .../actions/builtin/publish/github.test.ts    | 32 ++++++++-----------
 .../actions/builtin/publish/github.ts         | 14 +++++---
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
index 2ab3cfb523..0fd6373c7e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
@@ -399,7 +399,7 @@ describe('publish:github', () => {
         collaborators: [
           {
             access: 'pull',
-            team: 'robot-1'
+            username: 'robot-1',
           },
           {
             access: 'push',
@@ -410,30 +410,24 @@ describe('publish:github', () => {
     });
 
     const commonProperties = {
-      org: 'owner',
       owner: 'owner',
       repo: 'repo',
     };
 
-    expect(
-      mockOctokit.rest.teams.addOrUpdateRepoPermissionsInOrg.mock.calls[1],
-    ).toEqual([
-      {
-        ...commonProperties,
-        team_slug: 'robot-1',
-        permission: 'pull',
-      },
-    ]);
+    expect(mockOctokit.rest.repos.addCollaborator).toHaveBeenCalledWith({
+      ...commonProperties,
+      username: 'robot-1',
+      permission: 'pull',
+    });
 
     expect(
-      mockOctokit.rest.teams.addOrUpdateRepoPermissionsInOrg.mock.calls[2],
-    ).toEqual([
-      {
-        ...commonProperties,
-        team_slug: 'robot-2',
-        permission: 'push',
-      },
-    ]);
+      mockOctokit.rest.teams.addOrUpdateRepoPermissionsInOrg,
+    ).toHaveBeenCalledWith({
+      ...commonProperties,
+      org: 'owner',
+      team_slug: 'robot-2',
+      permission: 'push',
+    });
   });
 
   it('should ignore failures when adding multiple collaborators', async () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 3deb074a1b..1e343c0799 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -172,8 +172,8 @@ export function createPublishGithubAction(options: {
                 },
                 team: {
                   type: 'string',
-                  description: 'The team name'
-                }
+                  description: 'The team name',
+                },
               },
             },
           },
@@ -307,9 +307,13 @@ export function createPublishGithubAction(options: {
         for (const collaborator of collaborators) {
           try {
             if (collaborator.username) {
-              await client.rest.repos.addCollaborator({ owner, repo, username: collaborator.username, permissions: collaborator.access });
-            }
-            else {
+              await client.rest.repos.addCollaborator({
+                owner,
+                repo,
+                username: collaborator.username,
+                permission: collaborator.access,
+              });
+            } else {
               await client.rest.teams.addOrUpdateRepoPermissionsInOrg({
                 org: owner,
                 team_slug: collaborator.team,