skip pushed without commits

Author: podviaznikov

lib/routes/actions/github.js

@@ -60,17 +60,22 @@ app.post('/actions/github/',
         mw.res.status(202),
         mw.res.send('Deleted the branch; no work to be done.')),
     parseGitHubPushData,
-    instances.findInstancesLinkedToBranch('githubPushInfo.repo', 'githubPushInfo.branch'),
-    // check if there are instances that follow specific branch
-    mw.req('instances.length').validate(validations.equals(0))
+    mw.req('githubPushInfo.commitLog.length').validate(validations.equals(0))
       .then(
-        // no instances found. This can be push to the new branch
-        newBranch()
-      )
+        mw.res.status(202),
+        mw.res.send('No commits pushed; no work to be done.'))
       .else(
-        // instances following particular branch were found. Redeploy them with the new code
-        followBranch('instances')
-      )
+        instances.findInstancesLinkedToBranch('githubPushInfo.repo', 'githubPushInfo.branch'),
+        // check if there are instances that follow specific branch
+        mw.req('instances.length').validate(validations.equals(0))
+          .then(
+            // no instances found. This can be push to the new branch
+            newBranch()
+          )
+          .else(
+            // instances following particular branch were found. Redeploy them with the new code
+            followBranch('instances')
+          ))
   ),
   mw.res.status(501),
   mw.res.send('No action set up for that payload.'));
@@ -88,7 +93,7 @@ function parseGitHubPushData (req, res, next) {
     branch  : req.body.ref.replace('refs/heads/', ''),
     commit  : req.body.head_commit.id,
     headCommit: req.body.head_commit,
-    commitLog : req.body.commits,
+    commitLog : req.body.commits || [],
     user: req.body.sender
   };
   next();

test/actions-github.js

@@ -1,3 +1,4 @@
+'use strict';
 var Lab = require('lab');
 var describe = Lab.experiment;
 var it = Lab.test;
@@ -76,10 +77,10 @@ describe('Github - /actions/github', function () {
       process.env.ENABLE_BUILDS_ON_GIT_PUSH = ctx.originalBuildsOnPushSetting;
       done();
     });
-    it('should just say hi if hooks are disabled', function (done) {
+    it('should send response immediately if hooks are disabled', function (done) {
       var options = hooks(ctx.contextVersion.json()).push;
       options.json.ref = 'refs/heads/someotherbranch';
-      // require('./fixtures/mocks/github/users-username')(101, 'bkendall');
+      require('./fixtures/mocks/github/users-username')(101, 'bkendall');
       request.post(options, function (err, res) {
         if (err) {
           done(err);
@@ -93,6 +94,55 @@ describe('Github - /actions/github', function () {
     });
   });
 
+  describe('ignore hooks without commits data', function () {
+    var ctx = {};
+    beforeEach(function (done) {
+      process.env.ENABLE_BUILDS_ON_GIT_PUSH = 'true';
+      multi.createInstance(function (err, instance, build, user, modelsArr) {
+        ctx.contextVersion = modelsArr[0];
+        ctx.context = modelsArr[1];
+        ctx.build = build;
+        ctx.user = user;
+        done(err);
+      });
+    });
+
+    it('should send response immediately there are no commits data ([]) in the payload ', function (done) {
+      var options = hooks(ctx.contextVersion.json()).push;
+      options.json.ref = 'refs/heads/someotherbranch';
+      options.json.commits = [];
+      require('./fixtures/mocks/github/users-username')(101, 'bkendall');
+      request.post(options, function (err, res) {
+        if (err) {
+          done(err);
+        }
+        else {
+          expect(res.statusCode).to.equal(202);
+          expect(res.body).to.equal('No commits pushed; no work to be done.');
+          done();
+        }
+      });
+    });
+
+    it('should send response immediately there are no commits data (null) in the payload ', function (done) {
+      var options = hooks(ctx.contextVersion.json()).push;
+      options.json.ref = 'refs/heads/someotherbranch';
+      options.json.commits = null;
+      require('./fixtures/mocks/github/users-username')(101, 'bkendall');
+      request.post(options, function (err, res) {
+        if (err) {
+          done(err);
+        }
+        else {
+          expect(res.statusCode).to.equal(202);
+          expect(res.body).to.equal('No commits pushed; no work to be done.');
+          done();
+        }
+      });
+    });
+  });
+
+
   // describe('push', function () {
   //   var ctx = {};
   //   beforeEach(function (done) {