Merge pull request #287 from BuddyBuild/clint/ghi-support

Support running on a Github App
danger · Jun 20, 2017 · ac73ba2 · ac73ba2
2 parents 9aa4ab8 + c40a233
commit ac73ba2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/changelog.md b/changelog.md
@@ -5,6 +5,7 @@
 -   Use HTTP for the GitHub status check target URL - macklinu
 -   Correct some examples in node-app - clintam
 -   Add support for buddybuild CI - benkraus/clintam
+-   Add support for GithHub Apps API (no GET /user) - clintam
 
 ### 0.21.0
 

diff --git a/source/platforms/github/GitHubAPI.ts b/source/platforms/github/GitHubAPI.ts
@@ -76,7 +76,7 @@ export class GitHubAPI {
     const allComments: any[] = await this.getPullRequestComments()
     const dangerComment = find(
       allComments,
-      (comment: any) => comment.user.id === userID && v.includes(comment.body, dangerSignaturePostfix)
+      (comment: any) => (!userID || comment.user.id === userID) && v.includes(comment.body, dangerSignaturePostfix)
     )
     return dangerComment ? dangerComment.id : null
   }
@@ -102,7 +102,10 @@ export class GitHubAPI {
     return Promise.resolve(res.status === 204)
   }
 
-  async getUserID(): Promise<number> {
+  async getUserID(): Promise<number | undefined> {
+    if (process.env["DANGER_GITHUB_APP"]) {
+      return
+    }
     const info = await this.getUserInfo()
     return info.id
   }

diff --git a/source/platforms/github/_tests/_github_api.test.ts b/source/platforms/github/_tests/_github_api.test.ts
@@ -61,12 +61,16 @@ describe("API testing", () => {
 })
 
 describe("Peril", () => {
-  it("Allows setting additional headers", async () => {
+  let api: GitHubAPI
+
+  beforeEach(() => {
     const mockSource = new FakeCI({})
-    const api = new GitHubAPI(mockSource, "ABCDE")
+    api = new GitHubAPI(mockSource, "ABCDE")
     api.fetch = jest.fn()
     api.additionalHeaders = { CUSTOM: "HEADER" }
+  })
 
+  it("Allows setting additional headers", async () => {
     const request = await api.get("user")
     expect(api.fetch).toHaveBeenCalledWith("https://api.github.com/user", {
       body: {},
@@ -78,4 +82,18 @@ describe("Peril", () => {
       method: "GET",
     })
   })
+
+  describe("Allows setting DANGER_GITHUB_APP env variable", () => {
+    beforeEach(() => {
+      process.env.DANGER_GITHUB_APP = "1"
+    })
+
+    afterEach(() => {
+      delete process.env.DANGER_GITHUB_APP
+    })
+
+    it("Makes getUserId return undefined", async () => {
+      expect(await api.getUserID()).toBeUndefined()
+    })
+  })
 })