apify-test-tools 0.6.3 → 0.6.4-beta.0

package/package.json

@@ -1,63 +1,63 @@
 {
-    "name": "apify-test-tools",
-    "version": "0.6.3",
-    "type": "module",
-    "description": "TBD",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/apify/apify-test-tools.git"
-    },
-    "engines": {
-        "node": ">=18.0.0"
-    },
-    "bin": {
-        "apify-test-tools": "dist/bin/main.js"
-    },
-    "types": "./dist/index.d.ts",
-    "main": "./dist/lib/lib.js",
-    "dependencies": {
-        "@apify/consts": "^2.43.0",
-        "@slack/web-api": "^7.9.2",
-        "apify-client": "^2.22.2",
-        "yargs": "^18.0.0"
-    },
-    "devDependencies": {
-        "@apify/eslint-config": "^1.0.0",
-        "@apify/tsconfig": "^0.1.1",
-        "@types/node": "^24.0.0",
-        "@types/yargs": "^17.0.33",
-        "eslint": "^9.29.0",
-        "eslint-config-prettier": "^10.1.5",
-        "globals": "^17.0.0",
-        "prettier": "^3.5.3",
-        "tsx": "^4.20.3",
-        "typescript": "^5.9.3",
-        "typescript-eslint": "^8.34.1",
-        "vitest": "^3.2.4",
-        "knip": "^5.65.0",
-        "husky": "^9.0.11",
-        "lint-staged": "^15.2.2"
-    },
-    "peerDependencies": {
-        "vitest": ">=3.2.4"
-    },
-    "scripts": {
-        "start": "npm run dist/bin/main.js",
-        "start:dev": "GITHUB_WORKSPACE=local-clone tsx bin/main.ts",
-        "build": "tsc && chmod +x ./dist/bin/main.js",
-        "lint": "eslint",
-        "lint:fix": "eslint --fix",
-        "format": "prettier --write .",
-        "format:check": "prettier --check .",
-        "type-check": "tsc --noEmit",
-        "test": "vitest run",
-        "check-unused": "npx knip",
-        "prepare": "husky .husky || true"
-    },
-    "lint-staged": {
-        "*.js": "eslint",
-        "*.ts": "eslint"
-    },
-    "author": "oklinov",
-    "license": "ISC"
+  "name": "apify-test-tools",
+  "version": "0.6.4-beta.0",
+  "type": "module",
+  "description": "TBD",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apify/apify-test-tools.git"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "bin": {
+    "apify-test-tools": "dist/bin/main.js"
+  },
+  "types": "./dist/index.d.ts",
+  "main": "./dist/lib/lib.js",
+  "dependencies": {
+    "@apify/consts": "^2.43.0",
+    "@slack/web-api": "^7.9.2",
+    "apify-client": "^2.22.2",
+    "yargs": "^18.0.0"
+  },
+  "devDependencies": {
+    "@apify/eslint-config": "^1.0.0",
+    "@apify/tsconfig": "^0.1.1",
+    "@types/node": "^24.0.0",
+    "@types/yargs": "^17.0.33",
+    "eslint": "^9.29.0",
+    "eslint-config-prettier": "^10.1.5",
+    "globals": "^17.0.0",
+    "prettier": "^3.5.3",
+    "tsx": "^4.20.3",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.34.1",
+    "vitest": "^3.2.4",
+    "knip": "^5.65.0",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2"
+  },
+  "peerDependencies": {
+    "vitest": ">=3.2.4"
+  },
+  "scripts": {
+    "start": "npm run dist/bin/main.js",
+    "start:dev": "GITHUB_WORKSPACE=local-clone tsx bin/main.ts",
+    "build": "tsc && chmod +x ./dist/bin/main.js",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "type-check": "tsc --noEmit",
+    "test": "vitest run",
+    "check-unused": "npx knip",
+    "prepare": "husky .husky || true"
+  },
+  "lint-staged": {
+    "*.js": "eslint",
+    "*.ts": "eslint"
+  },
+  "author": "oklinov",
+  "license": "ISC"
 }

package/test/unit/bin/git.test.ts

@@ -1,7 +1,13 @@
 import type { MockInstance } from 'vitest';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { getChangedFiles, getCommits, parseBaseCommit } from '../../../bin/git.js';
+import {
+    getBranchOnlyChangedFiles,
+    getChangedFiles,
+    getCommits,
+    hasMergeFromTarget,
+    parseBaseCommit,
+} from '../../../bin/git.js';
 import * as Utils from '../../../bin/utils.js';
 
 describe('getCommits', () => {
@@ -117,6 +123,86 @@ describe('getChangedFiles', () => {
     });
 });
 
+describe('hasMergeFromTarget', () => {
+    const sourceBranch = 'feature-branch';
+    const targetBranch = 'main';
+    const mergeSha = 'f'.repeat(40);
+    const branchParentSha = 'b'.repeat(40);
+    const targetParentSha = 't'.repeat(40);
+
+    let gitCommandSpy: MockInstance;
+
+    beforeEach(() => {
+        gitCommandSpy = vi.spyOn(Utils, 'spawnCommandInGhWorkspace');
+    });
+
+    it('should return false when there are no merge commits on the branch', () => {
+        gitCommandSpy.mockImplementation((cmd: string) => {
+            if (cmd.includes('--merges')) return '';
+            return '';
+        });
+
+        expect(hasMergeFromTarget(sourceBranch, targetBranch)).toBe(false);
+        expect(gitCommandSpy).toHaveBeenCalledWith(
+            `git log --merges --pretty=format:%H ${targetBranch}..${sourceBranch}`,
+        );
+    });
+
+    it('should return true when a merge commit has a parent reachable from targetBranch', () => {
+        gitCommandSpy.mockImplementation((cmd: string) => {
+            if (cmd.includes('--merges')) return mergeSha;
+            if (cmd.includes('--pretty=format:%P')) return `${branchParentSha} ${targetParentSha}`;
+            if (cmd.startsWith(`git merge-base ${branchParentSha}`)) return branchParentSha; // not ancestor
+            if (cmd.startsWith(`git merge-base ${targetParentSha}`)) return targetParentSha; // is ancestor
+            return '';
+        });
+
+        expect(hasMergeFromTarget(sourceBranch, targetBranch)).toBe(true);
+    });
+
+    it('should return false when the merge commit parent is not reachable from targetBranch (unrelated branch merge)', () => {
+        const unrelatedSha = 'e'.repeat(40);
+        const differentMergeBase = '0'.repeat(40);
+        gitCommandSpy.mockImplementation((cmd: string) => {
+            if (cmd.includes('--merges')) return mergeSha;
+            if (cmd.includes('--pretty=format:%P')) return `${branchParentSha} ${unrelatedSha}`;
+            // merge-base returns something other than the parent — not an ancestor
+            if (cmd.startsWith('git merge-base')) return differentMergeBase;
+            return '';
+        });
+
+        expect(hasMergeFromTarget(sourceBranch, targetBranch)).toBe(false);
+    });
+});
+
+describe('getBranchOnlyChangedFiles', () => {
+    const sourceBranch = 'feature-branch';
+    const targetBranch = 'main';
+
+    let gitCommandSpy: MockInstance;
+
+    beforeEach(() => {
+        gitCommandSpy = vi.spyOn(Utils, 'spawnCommandInGhWorkspace');
+    });
+
+    it('should return files touched by non-merge commits', () => {
+        gitCommandSpy.mockReturnValue('README.md\n\nactors/foo_bar/src/main.ts\n');
+
+        const result = getBranchOnlyChangedFiles(sourceBranch, targetBranch);
+
+        expect(result).toStrictEqual(['README.md', 'actors/foo_bar/src/main.ts']);
+        expect(gitCommandSpy).toHaveBeenCalledWith(
+            `git log --no-merges --name-only --pretty=format: ${targetBranch}..${sourceBranch}`,
+        );
+    });
+
+    it('should return empty array when there are no non-merge commits', () => {
+        gitCommandSpy.mockReturnValue('');
+
+        expect(getBranchOnlyChangedFiles(sourceBranch, targetBranch)).toStrictEqual([]);
+    });
+});
+
 const VALID_SHA = 'a'.repeat(40);
 const VALID_JSON = JSON.stringify({ sha: VALID_SHA, author: 'test', date: 'now', message: 'msg' });