Use context payload in create-status

Remove `commitSha` argument from `create-status` and use the context's payload to retrieve the pull request's head SHA.
jarrodldavis · Sep 30, 2017 · 8134209 · 8134209
1 parent fe09017
commit 8134209
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/lib/create-status.js b/lib/create-status.js
@@ -14,9 +14,9 @@ const statuses = {
   }
 };
 
-module.exports = (github, context, commitSha, gpgStatus) => {
+module.exports = (github, context, gpgStatus) => {
   const statusParams = {
-    sha: commitSha,
+    sha: context.payload.pull_request.head.sha,
     context: 'GPG'
   };
 

diff --git a/lib/handle-event.js b/lib/handle-event.js
@@ -13,5 +13,5 @@ module.exports = async (robot, context) => {
     status = 'error';
   }
 
-  return createStatus(github, context, headSha, status);
+  return createStatus(github, context, status);
 };
diff --git a/test/create-status.js b/test/create-status.js
@@ -7,9 +7,20 @@ const GitHubMock = require('./mocks/github');
 
 const createSha = require('./utils/create-sha');
 
-const contextMock = new ContextMock();
 const githubMock = new GitHubMock();
 
+function arrange() {
+  const sha = createSha();
+  const contextMock = new ContextMock({
+    pull_request: { // eslint-disable-line camelcase
+      head: {
+        sha
+      }
+    }
+  });
+  return { contextMock, sha };
+}
+
 describe('create-status', () => {
   beforeEach(() => {
     sinon.spy(githubMock.repos, 'createStatus');
@@ -20,8 +31,8 @@ describe('create-status', () => {
   });
 
   it('should create a success state when `gpgStatus` is "success"', () => {
-    const sha = createSha();
-    createStatus(githubMock, contextMock, sha, 'success');
+    const { sha, contextMock } = arrange();
+    createStatus(githubMock, contextMock, 'success');
     sinon.assert.calledWith(githubMock.repos.createStatus, {
       sha,
       context: 'GPG',
@@ -33,8 +44,8 @@ describe('create-status', () => {
   });
 
   it('should create a failure state when `gpgStatus` is "failure"', () => {
-    const sha = createSha();
-    createStatus(githubMock, contextMock, sha, 'failure');
+    const { sha, contextMock } = arrange();
+    createStatus(githubMock, contextMock, 'failure');
     sinon.assert.calledWith(githubMock.repos.createStatus, {
       sha,
       context: 'GPG',
@@ -47,8 +58,8 @@ describe('create-status', () => {
   });
 
   it('should create an error state when `gpgStatus` is "error"', () => {
-    const sha = createSha();
-    createStatus(githubMock, contextMock, sha, 'error');
+    const { sha, contextMock } = arrange();
+    createStatus(githubMock, contextMock, 'error');
     sinon.assert.calledWith(githubMock.repos.createStatus, {
       sha,
       context: 'GPG',
@@ -60,8 +71,8 @@ describe('create-status', () => {
   });
 
   it('should create an error state when `gpgStatus` is unexpected', () => {
-    const sha = createSha();
-    createStatus(githubMock, contextMock, sha, 42);
+    const { sha, contextMock } = arrange();
+    createStatus(githubMock, contextMock, 42);
     sinon.assert.calledWith(githubMock.repos.createStatus, {
       sha,
       context: 'GPG',

diff --git a/test/handle-event.js b/test/handle-event.js
@@ -39,7 +39,7 @@ describe('handle-event', () => {
     // Assert
     sinon.assert.calledWith(robotMock.auth, payload.installation.id);
     sinon.assert.calledWith(validateGpgSpy, githubMock, contextMock, baseSha, headSha);
-    sinon.assert.calledWith(createStatusSpy, githubMock, contextMock, headSha, status);
+    sinon.assert.calledWith(createStatusSpy, githubMock, contextMock, status);
     assert.equal(result, createStatusResult);
   }