Capture PR body when scanning (#8)

apexskier · Oct 9, 2020 · 80cba13 · 80cba13
1 parent 58609b0
commit 80cba13
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/dst/index.js b/dst/index.js
diff --git a/src/__snapshots__/index.test.ts.snap b/src/__snapshots__/index.test.ts.snap
@@ -17,7 +17,7 @@ Object {
                     }
                     edges {
                       node {
-                        title
+                        bodyHTML
                         number
                         timelineItems(itemTypes: [CONNECTED_EVENT, DISCONNECTED_EVENT], first: 100) {
                           pageInfo {
@@ -65,7 +65,7 @@ Object {
                     }
                     edges {
                       node {
-                        title
+                        bodyHTML
                         number
                         timelineItems(itemTypes: [CONNECTED_EVENT, DISCONNECTED_EVENT], first: 100) {
                           pageInfo {
@@ -127,6 +127,18 @@ Object {
             "issue_number": 123,
           },
         ],
+        Array [
+          Object {
+            "body": "Included in release [current_tag_name](http://current_release)",
+            "issue_number": 4,
+          },
+        ],
+        Array [
+          Object {
+            "body": "Included in release [current_tag_name](http://current_release)",
+            "issue_number": 5,
+          },
+        ],
         Array [
           Object {
             "body": "Included in release [current_tag_name](http://current_release)",
@@ -147,6 +159,14 @@ Object {
           "type": "return",
           "value": Promise {},
         },
+        Object {
+          "type": "return",
+          "value": Promise {},
+        },
+        Object {
+          "type": "return",
+          "value": Promise {},
+        },
       ],
     },
   },

diff --git a/src/index.test.ts b/src/index.test.ts
@@ -53,6 +53,8 @@ test("main test", async () => {
             edges: [
               {
                 node: {
+                  bodyHTML:
+                    '<span class="issue-keyword tooltipped tooltipped-se" aria-label="This commit closes issue #4.">Closes</span> <span class="issue-keyword tooltipped tooltipped-se" aria-label="This commit closes issue #5.">Closes</span>',
                   timelineItems: {
                     pageInfo: { hasNextPage: false },
                     nodes: [

diff --git a/src/index.ts b/src/index.ts
@@ -57,7 +57,7 @@ const closesMatcher = /aria-label="This commit closes issue #(\d+)\."/g;
                     }
                     edges {
                       node {
-                        title
+                        bodyHTML
                         number
                         timelineItems(itemTypes: [CONNECTED_EVENT, DISCONNECTED_EVENT], first: 100) {
                           pageInfo {
@@ -99,7 +99,7 @@ const closesMatcher = /aria-label="This commit closes issue #(\d+)\."/g;
                 pageInfo: { hasNextPage: boolean };
                 edges: Array<{
                   node: {
-                    title: string;
+                    bodyHTML: string;
                     number: number;
                     timelineItems: {
                       pageInfo: { hasNextPage: boolean };
@@ -123,10 +123,13 @@ const closesMatcher = /aria-label="This commit closes issue #(\d+)\."/g;
 
           core.info(JSON.stringify(response.resource, null, 2));
 
-          const html =
-            response.resource.messageHeadlineHTML +
-            " " +
-            response.resource.messageBodyHTML;
+          const html = [
+            response.resource.messageHeadlineHTML,
+            response.resource.messageBodyHTML,
+            ...response.resource.associatedPullRequests.edges.map(
+              (pr) => pr.node.bodyHTML
+            ),
+          ].join(" ");
           for (const match of html.matchAll(closesMatcher)) {
             const [, num] = match;
             linkedIssuesPrs.add(num);