test: fix failing chain tests

Author: jescalada

test/chain.test.js

@@ -18,6 +18,7 @@ const mockLoader = {
 const initMockPushProcessors = (sinon) => {
   const mockPushProcessors = {
     parsePush: sinon.stub(),
+    checkEmptyBranch: sinon.stub(),
     audit: sinon.stub(),
     checkRepoInAuthorisedList: sinon.stub(),
     checkCommitMessages: sinon.stub(),
@@ -33,9 +34,9 @@ const initMockPushProcessors = (sinon) => {
     clearBareClone: sinon.stub(),
     scanDiff: sinon.stub(),
     blockForAuth: sinon.stub(),
-    getMissingData: sinon.stub(),
   };
   mockPushProcessors.parsePush.displayName = 'parsePush';
+  mockPushProcessors.checkEmptyBranch.displayName = 'checkEmptyBranch';
   mockPushProcessors.audit.displayName = 'audit';
   mockPushProcessors.checkRepoInAuthorisedList.displayName = 'checkRepoInAuthorisedList';
   mockPushProcessors.checkCommitMessages.displayName = 'checkCommitMessages';
@@ -51,7 +52,6 @@ const initMockPushProcessors = (sinon) => {
   mockPushProcessors.clearBareClone.displayName = 'clearBareClone';
   mockPushProcessors.scanDiff.displayName = 'scanDiff';
   mockPushProcessors.blockForAuth.displayName = 'blockForAuth';
-  mockPushProcessors.getMissingData.displayName = 'getMissingData';
   return mockPushProcessors;
 };
 const mockPreProcessors = {
@@ -127,6 +127,7 @@ describe('proxy chain', function () {
     const continuingAction = { type: 'push', continue: () => true, allowPush: false };
     mockPreProcessors.parseAction.resolves({ type: 'push' });
     mockPushProcessors.parsePush.resolves(continuingAction);
+    mockPushProcessors.checkEmptyBranch.resolves(continuingAction);
     mockPushProcessors.checkRepoInAuthorisedList.resolves(continuingAction);
     mockPushProcessors.checkCommitMessages.resolves(continuingAction);
     mockPushProcessors.checkAuthorEmails.resolves(continuingAction);
@@ -152,7 +153,7 @@ describe('proxy chain', function () {
     expect(mockPushProcessors.pullRemote.called).to.be.true;
     expect(mockPushProcessors.checkHiddenCommits.called).to.be.true;
     expect(mockPushProcessors.writePack.called).to.be.true;
-    expect(mockPushProcessors.getMissingData.called).to.be.false;
+    expect(mockPushProcessors.checkEmptyBranch.called).to.be.true;
     expect(mockPushProcessors.audit.called).to.be.true;
 
     expect(result.type).to.equal('push');
@@ -165,6 +166,7 @@ describe('proxy chain', function () {
     const continuingAction = { type: 'push', continue: () => true, allowPush: false };
     mockPreProcessors.parseAction.resolves({ type: 'push' });
     mockPushProcessors.parsePush.resolves(continuingAction);
+    mockPushProcessors.checkEmptyBranch.resolves(continuingAction);
     mockPushProcessors.checkRepoInAuthorisedList.resolves(continuingAction);
     mockPushProcessors.checkCommitMessages.resolves(continuingAction);
     mockPushProcessors.checkAuthorEmails.resolves(continuingAction);
@@ -182,6 +184,7 @@ describe('proxy chain', function () {
 
     expect(mockPreProcessors.parseAction.called).to.be.true;
     expect(mockPushProcessors.parsePush.called).to.be.true;
+    expect(mockPushProcessors.checkEmptyBranch.called).to.be.true;
     expect(mockPushProcessors.checkRepoInAuthorisedList.called).to.be.true;
     expect(mockPushProcessors.checkCommitMessages.called).to.be.true;
     expect(mockPushProcessors.checkAuthorEmails.called).to.be.true;
@@ -190,7 +193,6 @@ describe('proxy chain', function () {
     expect(mockPushProcessors.pullRemote.called).to.be.true;
     expect(mockPushProcessors.checkHiddenCommits.called).to.be.true;
     expect(mockPushProcessors.writePack.called).to.be.true;
-    expect(mockPushProcessors.getMissingData.called).to.be.false;
     expect(mockPushProcessors.audit.called).to.be.true;
 
     expect(result.type).to.equal('push');
@@ -203,6 +205,7 @@ describe('proxy chain', function () {
     const continuingAction = { type: 'push', continue: () => true, allowPush: false };
     mockPreProcessors.parseAction.resolves({ type: 'push' });
     mockPushProcessors.parsePush.resolves(continuingAction);
+    mockPushProcessors.checkEmptyBranch.resolves(continuingAction);
     mockPushProcessors.checkRepoInAuthorisedList.resolves(continuingAction);
     mockPushProcessors.checkCommitMessages.resolves(continuingAction);
     mockPushProcessors.checkAuthorEmails.resolves(continuingAction);
@@ -217,12 +220,12 @@ describe('proxy chain', function () {
     mockPushProcessors.clearBareClone.resolves(continuingAction);
     mockPushProcessors.scanDiff.resolves(continuingAction);
     mockPushProcessors.blockForAuth.resolves(continuingAction);
-    mockPushProcessors.getMissingData.resolves(continuingAction);
 
     const result = await chain.executeChain(req);
 
     expect(mockPreProcessors.parseAction.called).to.be.true;
     expect(mockPushProcessors.parsePush.called).to.be.true;
+    expect(mockPushProcessors.checkEmptyBranch.called).to.be.true;
     expect(mockPushProcessors.checkRepoInAuthorisedList.called).to.be.true;
     expect(mockPushProcessors.checkCommitMessages.called).to.be.true;
     expect(mockPushProcessors.checkAuthorEmails.called).to.be.true;
@@ -238,7 +241,6 @@ describe('proxy chain', function () {
     expect(mockPushProcessors.scanDiff.called).to.be.true;
     expect(mockPushProcessors.blockForAuth.called).to.be.true;
     expect(mockPushProcessors.audit.called).to.be.true;
-    expect(mockPushProcessors.getMissingData.called).to.be.true;
 
     expect(result.type).to.equal('push');
     expect(result.allowPush).to.be.false;
@@ -299,6 +301,7 @@ describe('proxy chain', function () {
 
     mockPreProcessors.parseAction.resolves(action);
     mockPushProcessors.parsePush.resolves(action);
+    mockPushProcessors.checkEmptyBranch.resolves(action);
     mockPushProcessors.checkRepoInAuthorisedList.resolves(action);
     mockPushProcessors.checkCommitMessages.resolves(action);
     mockPushProcessors.checkAuthorEmails.resolves(action);
@@ -320,7 +323,6 @@ describe('proxy chain', function () {
     mockPushProcessors.clearBareClone.resolves(action);
     mockPushProcessors.scanDiff.resolves(action);
     mockPushProcessors.blockForAuth.resolves(action);
-    mockPushProcessors.getMissingData.resolves(action);
     const dbStub = sinon.stub(db, 'authorise').resolves(true);
 
     const result = await chain.executeChain(req);
@@ -347,6 +349,7 @@ describe('proxy chain', function () {
 
     mockPreProcessors.parseAction.resolves(action);
     mockPushProcessors.parsePush.resolves(action);
+    mockPushProcessors.checkEmptyBranch.resolves(action);
     mockPushProcessors.checkRepoInAuthorisedList.resolves(action);
     mockPushProcessors.checkCommitMessages.resolves(action);
     mockPushProcessors.checkAuthorEmails.resolves(action);
@@ -368,7 +371,6 @@ describe('proxy chain', function () {
     mockPushProcessors.clearBareClone.resolves(action);
     mockPushProcessors.scanDiff.resolves(action);
     mockPushProcessors.blockForAuth.resolves(action);
-    mockPushProcessors.getMissingData.resolves(action);
 
     const dbStub = sinon.stub(db, 'reject').resolves(true);
 
@@ -396,6 +398,7 @@ describe('proxy chain', function () {
 
     mockPreProcessors.parseAction.resolves(action);
     mockPushProcessors.parsePush.resolves(action);
+    mockPushProcessors.checkEmptyBranch.resolves(action);
     mockPushProcessors.checkRepoInAuthorisedList.resolves(action);
     mockPushProcessors.checkCommitMessages.resolves(action);
     mockPushProcessors.checkAuthorEmails.resolves(action);
@@ -417,7 +420,6 @@ describe('proxy chain', function () {
     mockPushProcessors.clearBareClone.resolves(action);
     mockPushProcessors.scanDiff.resolves(action);
     mockPushProcessors.blockForAuth.resolves(action);
-    mockPushProcessors.getMissingData.resolves(action);
 
     const error = new Error('Database error');
 
@@ -444,6 +446,7 @@ describe('proxy chain', function () {
 
     mockPreProcessors.parseAction.resolves(action);
     mockPushProcessors.parsePush.resolves(action);
+    mockPushProcessors.checkEmptyBranch.resolves(action);
     mockPushProcessors.checkRepoInAuthorisedList.resolves(action);
     mockPushProcessors.checkCommitMessages.resolves(action);
     mockPushProcessors.checkAuthorEmails.resolves(action);
@@ -465,7 +468,6 @@ describe('proxy chain', function () {
     mockPushProcessors.clearBareClone.resolves(action);
     mockPushProcessors.scanDiff.resolves(action);
     mockPushProcessors.blockForAuth.resolves(action);
-    mockPushProcessors.getMissingData.resolves(action);
 
     const error = new Error('Database error');