Bug fix for GitHub-X-Event rejection

Author: k1o0

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## [Latest](https://github.com/cortex-lab/matlab-ci/commits/master) [2.2.0]
+## [Latest](https://github.com/cortex-lab/matlab-ci/commits/master) [2.2.1]
+
+## Modified
+
+ - fix error where github even incorrectly rejected
+ - fix bug incorrect log name when endpoint called with branch name
+ 
+## [2.2.0]
 
 ## Added
  - nyc dependency for manual coverage of matlab-ci

README.md

@@ -1,6 +1,6 @@
 # MATLAB-ci
 [![Build Status](https://travis-ci.com/cortex-lab/matlab-ci.svg?branch=master)](https://travis-ci.com/cortex-lab/matlab-ci)
-[![Coverage](https://img.shields.io/badge/coverage-81.07-green)](https://img.shields.io/badge/coverage-72.35-yellowgreen)
+[![Coverage](https://img.shields.io/badge/coverage-81.58-green)](https://img.shields.io/badge/coverage-72.35-yellowgreen)
 
 A small set of modules written in Node.js for running automated tests of MATLAB code in response to GitHub events.  Also submits code coverage to the Coveralls API.
 

main.js

@@ -32,11 +32,6 @@ handler.on('*', evt => eventCallback(evt));
 queue.on('error', _ => {});
 
 
-// Log handler errors
-handler.on('error', function (err) {
-  console.error('Error:', err.message);
-})
-
 // Log any unhandled errors
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

serve.js

@@ -105,7 +105,7 @@ srv.post('/github', async (req, res, next) => {
    console.log('Post received')
    let id = req.header('x-github-hook-installation-target-id');
    if (id != process.env.GITHUB_APP_IDENTIFIER) { next(); return; }  // Not for us; move on
-   if (req.header('X-GitHub-Event') in supportedEvents) {
+   if (supportedEvents.includes(req.header('X-GitHub-Event'))) {
       await setAccessToken();
       handler(req, res, () => res.end('ok'));
    } else {

test/serve.test.js

@@ -253,11 +253,11 @@ describe("Github event handler callback", () => {
               },
            });
       await setAccessToken();
-      scope.done();
+      nock.cleanAll()
    }
 
-   before(function (done) {
-      setToken().then(() => done());
+   before(async function () {
+      await setToken();
       scope = nock('https://api.github.com', {
          reqheaders: {
             accept: 'application/vnd.github.machine-man-preview+json',
@@ -839,6 +839,23 @@ describe('srv github/', () => {
          });
    });
 
+   it('expect token set', (done) => {
+      // Although the blob signature won't match, we can at least test that setAccessToken was called
+      request(srv)
+         .post(`/github`)  // trailing slash essential
+         .set({
+            'X-GitHub-Event': 'push',
+            'x-github-hook-installation-target-id': process.env.GITHUB_APP_IDENTIFIER,
+            'X-Hub-Signature': {'sha': SHA},
+            'X-GitHub-Delivery': '72d3162e-cc78-11e3-81ab-4c9367dc0958'
+         })
+         .end(function (err) {
+            expect(scope.pendingMocks().length).lt(2);  // setAccessToken was called
+            err ? done(err) : done();
+         });
+   });
+
+
    after(function () {
       clock.restore();
    });