fix(octokit): searched to the commit sha

rather than the branch name, which was an accidental leftover from the previous version
greenkeeper-keeper · Mar 4, 2018 · 0590cf3 · 0590cf3
1 parent 3ad2b85
commit 0590cf3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/src/handler.js b/src/handler.js
@@ -13,7 +13,15 @@ function successfulStatusCouldBeForGreenkeeperPR(event, state, branches) {
 }
 
 export default async function (request, reply, settings) {
-  const {action, sender, state, repository, pull_request, branches} = request.payload;  // eslint-disable-line camelcase
+  const {
+    action,
+    sender,
+    state,
+    repository,
+    pull_request,         // eslint-disable-line camelcase
+    branches,
+    sha
+  } = request.payload;
   const event = request.headers['x-github-event'];
 
   if ('ping' === event) {
@@ -37,7 +45,7 @@ export default async function (request, reply, settings) {
   if (successfulStatusCouldBeForGreenkeeperPR(event, state, branches)) {
     const {getPullRequestsForCommit, getPullRequest} = createActions(settings.github);
 
-    return getPullRequestsForCommit({ref: branches[0].name})
+    return getPullRequestsForCommit({ref: sha})
       .then(async pullRequests => {
         if (!pullRequests.length) reply('no PRs for this commit').code(BAD_REQUEST);
         else if (1 < pullRequests.length) reply(boom.internal('too many PRs exist for this commit'));

diff --git a/test/integration/features/step_definitions/common-steps.js b/test/integration/features/step_definitions/common-steps.js
@@ -13,8 +13,7 @@ defineSupportCode(({When, Then, setWorldConstructor}) => {
       prDetails: {
         sender: this.prSender,
         comments: this.comments,
-        number: this.prNumber,
-        sha: this.sha
+        number: this.prNumber
       },
       statusEventDetails: {
         state: this.statusEventState,

diff --git a/test/integration/features/step_definitions/github-api-steps.js b/test/integration/features/step_definitions/github-api-steps.js
@@ -62,7 +62,7 @@ defineSupportCode(({Before, After, Given, setWorldConstructor}) => {
     }
     githubScope
       .matchHeader('Authorization', authorizationHeader)
-      .get(`/search/issues?q=${this.commitBranches[0]}+type%3Apr`)
+      .get(`/search/issues?q=${encodeURIComponent(this.sha)}+type%3Apr`)
       .reply(OK, {
         items: [{
           url: 'https://api.github.com/123',
@@ -77,7 +77,7 @@ defineSupportCode(({Before, After, Given, setWorldConstructor}) => {
   Given('no open PRs exist for the commit', function (callback) {
     githubScope
       .matchHeader('Authorization', authorizationHeader)
-      .get(`/search/issues?q=${this.commitBranches[0]}+type%3Apr`)
+      .get(`/search/issues?q=${encodeURIComponent(this.sha)}+type%3Apr`)
       .reply(OK, {items: []});
 
     callback();

diff --git a/test/integration/features/support/world.js b/test/integration/features/support/world.js
@@ -1,9 +1,13 @@
 import any from '@travi/any';
 
-function buildWebhookPayload(event, {action, prDetails, statusEventDetails, ref, repoFullName, repoName, repoOwner}) {
+function buildWebhookPayload(
+  event,
+  {action, prDetails, statusEventDetails, ref, repoFullName, repoName, repoOwner, sha}
+) {
   if ('pull_request' === event) {
     return {
       action,
+      sha,
       sender: {
         html_url: prDetails.sender
       },
@@ -13,7 +17,7 @@ function buildWebhookPayload(event, {action, prDetails, statusEventDetails, ref,
         comments_url: `https://api.github.com${prDetails.comments}`,
         url: 'https://api.github.com/123',
         head: {
-          sha: prDetails.sha,
+          sha,
           ref,
           repo: {
             full_name: repoFullName,
@@ -28,6 +32,7 @@ function buildWebhookPayload(event, {action, prDetails, statusEventDetails, ref,
   if ('status' === event) {
     return {
       state: statusEventDetails.state,
+      sha,
       repository: {
         full_name: repoFullName,
         name: repoName,
@@ -63,6 +68,7 @@ export function World() {
         action,
         prDetails,
         statusEventDetails,
+        sha: this.sha,
         ref: this.ref,
         repoFullName: this.repoFullName,
         repoName: this.repoName,

diff --git a/test/unit/handler-test.js b/test/unit/handler-test.js
@@ -112,19 +112,21 @@ suite('handler', () => {
       const repository = any.simpleObject();
       const branch = any.string();
       const prNumber = any.integer();
+      const sha = any.string();
       const partialPullRequest = {user: {html_url: greenkeeperSender}, number: prNumber};
       const fullPullRequest = any.simpleObject();
       const request = {
         payload: {
           state: 'success',
+          sha,
           repository,
           branches: [{name: branch}]
         },
         headers: {'x-github-event': 'status'},
         log: () => undefined
       };
       reply.withArgs('ok').returns({code});
-      getPullRequestsForCommit.withArgs({ref: branch}).resolves([partialPullRequest]);
+      getPullRequestsForCommit.withArgs({ref: sha}).resolves([partialPullRequest]);
       getPullRequest.withArgs(repository, prNumber).resolves(fullPullRequest);
 
       return handler(request, reply, settings).then(() => {