test: split test into two

Author: fabiovincenzi

test/integration/forcePush.integration.test.js

@@ -57,24 +57,27 @@ describe('Force Push Integration Test', () => {
   });
 
   describe('Complete force push pipeline', () => {
-    it('should handle legitimate empty diff after rebase scenario', async function () {
+    it('should handle valid diff after rebase scenario', async function () {
       this.timeout(5000); // eslint-disable-line no-invalid-this
 
-      // Create action simulating force push with old unreachable SHA
+      // Create action simulating force push with valid SHAs that have actual changes
       const action = new Action(
-        'force-push-integration',
+        'valid-diff-integration',
         'push',
         'POST',
         Date.now(),
         'test/repo.git',
       );
       action.proxyGitPath = path.dirname(tempDir);
       action.repoName = path.basename(tempDir);
-      action.commitFrom = initialCommitSHA; // Old SHA
-      action.commitTo = rebasedCommitSHA; // New SHA after rebase
+
+      // Parent of initial commit to get actual diff content
+      const parentSHA = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
+      action.commitFrom = parentSHA;
+      action.commitTo = rebasedCommitSHA;
       action.commitData = [
         {
-          parent: initialCommitSHA,
+          parent: parentSHA,
           commit: rebasedCommitSHA,
           message: 'Add feature (rebased)',
           author: 'Test User',
@@ -86,33 +89,63 @@ describe('Force Push Integration Test', () => {
 
       const diffStep = afterGetDiff.steps.find((s) => s.stepName === 'diff');
       expect(diffStep).to.exist;
+      expect(diffStep.error).to.be.false;
+      expect(diffStep.content).to.be.a('string');
+      expect(diffStep.content.length).to.be.greaterThan(0);
 
-      // May produce empty diff or error - both should be handled
-      if (diffStep.error) {
-        console.log('getDiff failed as expected with unreachable commitFrom');
-        expect(diffStep.errorMessage).to.be.a('string');
-      } else {
-        console.log('getDiff succeeded, checking content');
-        expect(diffStep.content).to.satisfy(
-          (content) => content === null || content === undefined || typeof content === 'string',
-        );
-      }
-
-      // scanDiff should not block on empty/missing diff
       const afterScanDiff = await scanDiff({}, afterGetDiff);
       const scanStep = afterScanDiff.steps.find((s) => s.stepName === 'scanDiff');
 
       expect(scanStep).to.exist;
+      expect(scanStep.error).to.be.false;
+    });
+
+    it('should handle unreachable commit SHA error', async function () {
+      this.timeout(5000); // eslint-disable-line no-invalid-this
 
-      // scanDiff should NOT error on empty diff
-      if (diffStep.error || !diffStep.content) {
-        expect(scanStep.error).to.be.false;
-        console.log('scanDiff correctly allowed empty/missing diff');
-      } else {
-        // If diff exists, should process normally
-        expect(scanStep.error).to.be.false;
-        console.log('scanDiff processed valid diff content');
-      }
+      // Invalid SHA to trigger error
+      const action = new Action(
+        'unreachable-sha-integration',
+        'push',
+        'POST',
+        Date.now(),
+        'test/repo.git',
+      );
+      action.proxyGitPath = path.dirname(tempDir);
+      action.repoName = path.basename(tempDir);
+      action.commitFrom = 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'; // Invalid SHA
+      action.commitTo = rebasedCommitSHA;
+      action.commitData = [
+        {
+          parent: 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef',
+          commit: rebasedCommitSHA,
+          message: 'Add feature (rebased)',
+          author: 'Test User',
+        },
+      ];
+
+      const afterGetDiff = await getDiff({}, action);
+      expect(afterGetDiff.steps).to.have.length.greaterThan(0);
+
+      const diffStep = afterGetDiff.steps.find((s) => s.stepName === 'diff');
+      expect(diffStep).to.exist;
+      expect(diffStep.error).to.be.true;
+      expect(diffStep.errorMessage).to.be.a('string');
+      expect(diffStep.errorMessage.length).to.be.greaterThan(0);
+      expect(diffStep.errorMessage).to.satisfy(
+        (msg) =>
+          msg.includes('fatal:') ||
+          msg.includes('unknown revision') ||
+          msg.includes('bad revision'),
+        'Error message should contain git-specific error patterns',
+      );
+
+      // scanDiff should not block on missing diff due to error
+      const afterScanDiff = await scanDiff({}, afterGetDiff);
+      const scanStep = afterScanDiff.steps.find((s) => s.stepName === 'scanDiff');
+
+      expect(scanStep).to.exist;
+      expect(scanStep.error).to.be.false;
     });
 
     it('should handle missing diff step gracefully', async function () {

test/scanDiff.emptyDiff.test.js renamed to test/processors/scanDiff.emptyDiff.test.js

@@ -1,5 +1,5 @@
-const { Action } = require('../src/proxy/actions');
-const { exec } = require('../src/proxy/processors/push-action/scanDiff');
+const { Action } = require('../../src/proxy/actions');
+const { exec } = require('../../src/proxy/processors/push-action/scanDiff');
 
 const chai = require('chai');
 const expect = chai.expect;

test/scanDiff.test.js renamed to test/processors/scanDiff.test.js

@@ -1,14 +1,14 @@
 const chai = require('chai');
 const crypto = require('crypto');
-const processor = require('../src/proxy/processors/push-action/scanDiff');
-const { Action } = require('../src/proxy/actions/Action');
+const processor = require('../../src/proxy/processors/push-action/scanDiff');
+const { Action } = require('../../src/proxy/actions/Action');
 const { expect } = chai;
-const config = require('../src/config');
-const db = require('../src/db');
+const config = require('../../src/config');
+const db = require('../../src/db');
 chai.should();
 
 // Load blocked literals and patterns from configuration...
-const commitConfig = require('../src/config/index').getCommitConfig();
+const commitConfig = require('../../src/config/index').getCommitConfig();
 const privateOrganizations = config.getPrivateOrganizations();
 
 const blockedLiterals = commitConfig.diff.block.literals;