Fix github actions check

danger · Nov 5, 2019 · 13297ba · 13297ba
1 parent 6bbe565
commit 13297ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/source/ci_source/providers/GitHubActions.ts b/source/ci_source/providers/GitHubActions.ts
@@ -163,7 +163,7 @@ export class GitHubActions implements CISource {
   }
 
   get useEventDSL() {
-    return this.event.pull_request !== undefined || this.event.issue !== undefined
+    return this.event.pull_request === undefined && this.event.issue === undefined
   }
 
   get pullRequestID(): string {
@@ -179,8 +179,8 @@ export class GitHubActions implements CISource {
   get repoSlug(): string {
     if (this.event.pull_request !== undefined) {
       return this.event.pull_request.base.repo.full_name
-    } else if (this.event.repo !== undefined) {
-      return this.event.repo.full_name
+    } else if (this.event.repository !== undefined) {
+      return this.event.repository.full_name
     }
 
     throw new Error("repoSlug was called on GitHubActions when it wasn't a PR")

diff --git a/source/ci_source/providers/_tests/_gitHubActions.test.ts b/source/ci_source/providers/_tests/_gitHubActions.test.ts
@@ -15,25 +15,25 @@ const issueEvent = {
   issue: {
     number: "2",
   },
-  repo: {
+  repository: {
     full_name: "danger/danger-js",
   },
 }
 
 describe("use event DSL", () => {
-  it("returns true when event.json contains pull_request data", () => {
+  it("returns false when event.json contains pull_request data", () => {
     const ci = new GitHubActions({}, pullRequestEvent)
-    expect(ci.useEventDSL).toBeTruthy()
+    expect(ci.useEventDSL).toBeFalsy()
   })
 
-  it("returns true when event.json contains issue data", () => {
+  it("returns false when event.json contains issue data", () => {
     const ci = new GitHubActions({}, issueEvent)
-    expect(ci.useEventDSL).toBeTruthy()
+    expect(ci.useEventDSL).toBeFalsy()
   })
 
-  it("returns false when event.json doesn't contain issue or pull_request data", () => {
+  it("returns true when event.json doesn't contain issue or pull_request data", () => {
     const ci = new GitHubActions({}, {})
-    expect(ci.useEventDSL).toBeFalsy()
+    expect(ci.useEventDSL).toBeTruthy()
   })
 })