Merge pull request #35 from actualbudget/matiss/skip-autoassign-for-pr-author

Skip auto-assign when commenter/reviewer is the PR author

Author: MatissJanis

src/handlers/issueComment.ts

@@ -15,6 +15,10 @@ export default (app: Probot) => {
       context.payload.issue.number,
     );
 
+    // Don't auto-assign if the commenter is the PR author
+    const prAuthor = pr.data.user?.login;
+    if (commenter === prAuthor) return;
+
     const isMember = await pr.isOrgMember(commenter);
     if (!isMember) return;
 

src/handlers/pullRequestReview.ts

@@ -6,9 +6,10 @@ export default (app: Probot) => {
   app.on(['pull_request_review'], async context => {
     const pr = new PullRequest(context);
 
-    // Auto-assign reviewer if they are an org member
+    // Auto-assign reviewer if they are an org member and not the PR author
     const reviewer = context.payload.review.user?.login;
-    if (reviewer) {
+    const prAuthor = pr.data.user?.login;
+    if (reviewer && reviewer !== prAuthor) {
       const isMember = await pr.isOrgMember(reviewer);
       if (isMember) {
         try {

src/handlers/pullRequestReviewComment.ts

@@ -9,6 +9,10 @@ export default (app: Probot) => {
 
     const pr = new PullRequest(context);
 
+    // Don't auto-assign if the commenter is the PR author
+    const prAuthor = pr.data.user?.login;
+    if (commenter === prAuthor) return;
+
     const isMember = await pr.isOrgMember(commenter);
     if (!isMember) return;
 

test/autoAssign/issueComment.test.ts

@@ -111,4 +111,44 @@ describe('Issue Comment Auto-Assign', () => {
 
     expect(errorMock.isDone()).toBe(false);
   });
+
+  test('does not assign commenter when they are the PR author', async () => {
+    const prAuthorPayload = {
+      ...issueCommentPayload,
+      comment: {
+        ...issueCommentPayload.comment,
+        user: {
+          login: 'pr-author',
+          id: 456,
+        },
+      },
+    };
+
+    const mock = nock('https://api.github.com')
+      .post('/app/installations/2/access_tokens')
+      .reply(200, {
+        token: 'test',
+        permissions: {
+          pull_requests: 'write',
+        },
+      })
+      .get('/repos/your-repo/your-repo-name/pulls/1')
+      .reply(200, pullRequestPayload.pull_request);
+
+    const errorMock = nock('https://api.github.com')
+      .post('/repos/your-repo/your-repo-name/issues/1/assignees')
+      .reply(() => {
+        throw new Error(
+          'Assignee should not be called when commenter is PR author',
+        );
+      });
+
+    await probot.receive({
+      name: 'issue_comment',
+      payload: prAuthorPayload,
+    });
+
+    expect(mock.pendingMocks()).toStrictEqual([]);
+    expect(errorMock.isDone()).toBe(false);
+  });
 });

test/autoAssign/pullRequestReview.test.ts

@@ -85,4 +85,46 @@ describe('Pull Request Review Auto-Assign', () => {
     expect(mock.pendingMocks()).toStrictEqual([]);
     expect(errorMock.isDone()).toBe(false);
   });
+
+  test('does not assign reviewer when they are the PR author', async () => {
+    const prAuthorPayload = {
+      ...pullRequestReviewPayload,
+      review: {
+        ...pullRequestReviewPayload.review,
+        user: {
+          login: 'pr-author',
+          id: 456,
+        },
+      },
+    };
+
+    const mock = nock('https://api.github.com')
+      .post('/app/installations/2/access_tokens')
+      .reply(200, {
+        token: 'test',
+        permissions: {
+          pull_requests: 'write',
+        },
+      })
+      .get('/repos/your-repo/your-repo-name/pulls/1/reviews')
+      .reply(200, [])
+      .put('/repos/your-repo/your-repo-name/issues/1/labels')
+      .reply(200);
+
+    const errorMock = nock('https://api.github.com')
+      .post('/repos/your-repo/your-repo-name/issues/1/assignees')
+      .reply(() => {
+        throw new Error(
+          'Assignee should not be called when reviewer is PR author',
+        );
+      });
+
+    await probot.receive({
+      name: 'pull_request_review',
+      payload: prAuthorPayload,
+    });
+
+    expect(mock.pendingMocks()).toStrictEqual([]);
+    expect(errorMock.isDone()).toBe(false);
+  });
 });

test/autoAssign/pullRequestReviewComment.test.ts

@@ -77,4 +77,32 @@ describe('Pull Request Review Comment Auto-Assign', () => {
     expect(mock.pendingMocks()).toStrictEqual([]);
     expect(errorMock.isDone()).toBe(false);
   });
+
+  test('does not assign commenter when they are the PR author', async () => {
+    const prAuthorPayload = {
+      ...pullRequestReviewCommentPayload,
+      comment: {
+        ...pullRequestReviewCommentPayload.comment,
+        user: {
+          login: 'pr-author',
+          id: 456,
+        },
+      },
+    };
+
+    const errorMock = nock('https://api.github.com')
+      .post('/repos/your-repo/your-repo-name/issues/1/assignees')
+      .reply(() => {
+        throw new Error(
+          'Assignee should not be called when commenter is PR author',
+        );
+      });
+
+    await probot.receive({
+      name: 'pull_request_review_comment',
+      payload: prAuthorPayload,
+    });
+
+    expect(errorMock.isDone()).toBe(false);
+  });
 });

test/fixtures/pull_request.json

@@ -4,6 +4,10 @@
     "number": 1,
     "state": "open",
     "draft": false,
+    "user": {
+      "login": "pr-author",
+      "id": 456
+    },
     "head": {
       "sha": "abc123"
     },

test/fixtures/pull_request_review.json

@@ -13,6 +13,10 @@
     "number": 1,
     "state": "open",
     "draft": false,
+    "user": {
+      "login": "pr-author",
+      "id": 456
+    },
     "head": {
       "sha": "abc123"
     },

test/fixtures/pull_request_review_comment.json

@@ -13,6 +13,10 @@
     "number": 1,
     "state": "open",
     "draft": false,
+    "user": {
+      "login": "pr-author",
+      "id": 456
+    },
     "head": {
       "sha": "abc123"
     },