Merge branch 'master' into bitbucket-pending

danger · Oct 24, 2018 · c931a5e · c931a5e
2 parents b2cf4c9 + d603e31
commit c931a5e
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ## Master
 
 - Fix handling a `"pending"` status update properly using Bitbucket API - [@sgtcoolguy][]
+- Fix #614 - Posting status updates to Github using issue workflow broken - [@sgtcoolguy][]
 
 # 5.0.1, err. 6.0.0
 

diff --git a/source/platforms/github/GitHubAPI.ts b/source/platforms/github/GitHubAPI.ts
@@ -344,17 +344,21 @@ export class GitHubAPI {
     return res.ok ? res.json() : { labels: [] }
   }
 
-  updateStatus = async (passed: boolean, message: string, url?: string): Promise<any> => {
+  updateStatus = async (passed: boolean | "pending", message: string, url?: string): Promise<any> => {
     const repo = this.repoMetadata.repoSlug
 
     const prJSON = await this.getPullRequestInfo()
     const ref = prJSON.head.sha
+    let state = passed ? "success" : "failure"
+    if (passed === "pending") {
+      state = "pending"
+    }
     const res = await this.post(
       `repos/${repo}/statuses/${ref}`,
       {},
       {
-        state: passed ? "success" : "failure",
-        context: process.env["PERIL_INTEGRATION_ID"] ? "Peril" : "Danger",
+        state: state,
+        context: process.env["PERIL_BOT_USER_ID"] ? "Peril" : "Danger",
         target_url: url || "http://danger.systems/js",
         description: message,
       }

diff --git a/source/platforms/github/_tests/_github_api.test.ts b/source/platforms/github/_tests/_github_api.test.ts
@@ -147,6 +147,82 @@ describe("API testing", () => {
     await expect(api.postInlinePRComment("", "", "", 0)).rejects.toEqual(expectedJSON)
   })
 
+  it("updateStatus('pending') success", async () => {
+    api.fetch = jest.fn().mockReturnValue({ ok: true })
+    api.getPullRequestInfo = await requestWithFixturedJSON("github_pr.json")
+
+    await expect(api.updateStatus("pending", "message")).resolves.toEqual(true)
+    expect(api.fetch).toHaveBeenCalledWith(
+      "https://api.github.com/repos/artsy/emission/statuses/cfa8fb80d2b65f4c4fa0b54d25352a3a0ff58f75",
+      {
+        headers: {
+          Authorization: "token ABCDE",
+          "Content-Type": "application/json",
+        },
+        method: "POST",
+        body: '{"state":"pending","context":"Danger","target_url":"http://danger.systems/js","description":"message"}',
+      },
+      undefined
+    )
+  })
+
+  it("updateStatus(false) success", async () => {
+    api.fetch = jest.fn().mockReturnValue({ ok: true })
+    api.getPullRequestInfo = await requestWithFixturedJSON("github_pr.json")
+
+    await expect(api.updateStatus(false, "message")).resolves.toEqual(true)
+    expect(api.fetch).toHaveBeenCalledWith(
+      "https://api.github.com/repos/artsy/emission/statuses/cfa8fb80d2b65f4c4fa0b54d25352a3a0ff58f75",
+      {
+        headers: {
+          Authorization: "token ABCDE",
+          "Content-Type": "application/json",
+        },
+        method: "POST",
+        body: '{"state":"failure","context":"Danger","target_url":"http://danger.systems/js","description":"message"}',
+      },
+      undefined
+    )
+  })
+
+  it("updateStatus(true, 'message', 'http://example.org') success", async () => {
+    api.fetch = jest.fn().mockReturnValue({ ok: true })
+    api.getPullRequestInfo = await requestWithFixturedJSON("github_pr.json")
+
+    await expect(api.updateStatus(true, "message", "http://example.org")).resolves.toEqual(true)
+    expect(api.fetch).toHaveBeenCalledWith(
+      "https://api.github.com/repos/artsy/emission/statuses/cfa8fb80d2b65f4c4fa0b54d25352a3a0ff58f75",
+      {
+        headers: {
+          Authorization: "token ABCDE",
+          "Content-Type": "application/json",
+        },
+        method: "POST",
+        body: '{"state":"success","context":"Danger","target_url":"http://example.org","description":"message"}',
+      },
+      undefined
+    )
+  })
+
+  it("updateStatus(true) failed", async () => {
+    api.fetch = jest.fn().mockReturnValue({ ok: false })
+    api.getPullRequestInfo = await requestWithFixturedJSON("github_pr.json")
+
+    await expect(api.updateStatus(true, "message")).resolves.toEqual(false)
+    expect(api.fetch).toHaveBeenCalledWith(
+      "https://api.github.com/repos/artsy/emission/statuses/cfa8fb80d2b65f4c4fa0b54d25352a3a0ff58f75",
+      {
+        headers: {
+          Authorization: "token ABCDE",
+          "Content-Type": "application/json",
+        },
+        method: "POST",
+        body: '{"state":"success","context":"Danger","target_url":"http://danger.systems/js","description":"message"}',
+      },
+      undefined
+    )
+  })
+
   it("deleteCommentWithID", async () => {
     api.fetch = jest.fn().mockReturnValue({ status: 204 })
     await api.deleteCommentWithID(123)

diff --git a/source/platforms/github/comms/issueCommenter.ts b/source/platforms/github/comms/issueCommenter.ts
@@ -55,31 +55,8 @@ export const GitHubIssueCommenter = (api: GitHubAPI) => {
      * Fails the current build, if status setting succeeds
      * then return true.
      */
-
-    updateStatus: async (passed: boolean | "pending", message: string, url?: string): Promise<boolean> => {
-      const ghAPI = api.getExternalAPI()
-
-      const prJSON = await api.getPullRequestInfo()
-      const ref = prJSON.head
-      try {
-        await ghAPI.repos.createStatus({
-          repo: ref.repo.name,
-          owner: ref.repo.owner.login,
-          sha: ref.sha,
-          state: passed ? "success" : "failure",
-          context: process.env["PERIL_BOT_USER_ID"] ? "Peril" : "Danger",
-          target_url: url || "http://danger.systems/js",
-          description: message,
-        })
-        return true
-      } catch (error) {
-        // @ts-ignore
-        if (global.verbose) {
-          console.log("Got an error with creating a commit status", error)
-        }
-        return false
-      }
-    },
+    updateStatus: async (passed: boolean | "pending", message: string, url?: string): Promise<boolean> =>
+      api.updateStatus(passed, message, url),
 
     /**
      * Gets inline comments for current PR