Merge pull request #458 from danger/this_pr

Fixes to github.thisPR
danger · Dec 27, 2017 · 46b7716 · 46b7716
2 parents 9772aac + 53a1968
commit 46b7716
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,15 +3,14 @@ developers, so please limit technical // terminology to in here.
 
 // ### Master
 
-<<<<<<< HEAD
-
 ### 2.1.7
 
 * Fix Codeship integration - [@caffodian][]
 * Updates documentation dependencies - [@orta][]
 * Fixes to running `danger` with params - [@orta][]
 * Fixes for `danger pr` not acting like `danger` WRT async code - [@orta][]
 * Fixes `tsconfig.json` parse to be JSON5 friendly - [@gantman][]
+* Fixes for `danger.github.thisPR` to use the base metadata for a PR, I'm too used to branch workflows - [@orta][]
 
 ### 2.1.6
 

diff --git a/source/platforms/GitHub.ts b/source/platforms/GitHub.ts
@@ -160,8 +160,8 @@ export class GitHub {
   APIMetadataForPR(pr: GitHubPRDSL): GitHubAPIPR {
     return {
       number: pr.number,
-      repo: pr.head.repo.name,
-      owner: pr.head.repo.owner.login,
+      repo: pr.base.repo.name,
+      owner: pr.base.repo.owner.login,
     }
   }
 }

diff --git a/source/platforms/_tests/_github.test.ts b/source/platforms/_tests/_github.test.ts
@@ -99,7 +99,7 @@ describe("getPlatformDSLRepresentation", () => {
 
     expect(dsl.thisPR).toEqual({
       number: 327,
-      owner: "orta",
+      owner: "artsy",
       repo: "emission",
     })
   })