apify-test-tools 0.10.2-beta.1 → 0.10.2-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-test-tools",
-  "version": "0.10.2-beta.1",
+  "version": "0.10.2-beta.3",
   "type": "module",
   "description": "TBD",
   "repository": {
@@ -8,7 +8,14 @@
     "url": "https://github.com/apify/apify-test-tools.git"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
+  },
+  "devEngines": {
+    "packageManager": {
+      "name": "npm",
+      "version": ">=11.10.0",
+      "onFail": "warn"
+    }
   },
   "bin": {
     "apify-test-tools": "dist/bin/main.js"
@@ -32,6 +39,7 @@
     "@types/node": "^24.0.0",
     "@types/picomatch": "^4.0.3",
     "@types/yargs": "^17.0.33",
+    "esbuild": "0.25.12",
     "eslint": "^9.29.0",
     "eslint-config-prettier": "^10.1.5",
     "globals": "^17.0.0",
@@ -51,12 +59,14 @@
     "start": "npm run dist/bin/main.js",
     "start:dev": "cd local-clone && tsx ../bin/main.ts",
     "build": "tsc && chmod +x ./dist/bin/main.js",
+    "bundle": "esbuild bin/main.ts --bundle --minify --platform=node --format=esm --target=node24 --log-level=warning --banner:js=\"import{createRequire as __createRequire}from'node:module';const require=__createRequire(import.meta.url);\" --outfile=.github/cli/apify-test-tools.mjs",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "type-check": "tsc --noEmit",
-    "test": "vitest run",
+    "test": "vitest run --exclude 'test/e2e/**'",
+    "test:e2e": "vitest run test/e2e",
     "check-unused": "npx knip",
     "prepare": "husky .husky || true"
   },

package/test/bundle/cli-bundle.test.ts

@@ -0,0 +1,199 @@
+import { execFileSync, spawnSync } from 'node:child_process';
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+
+// Runs the committed bundle the composite action ships, not the sources, so these catch anything
+// that only breaks once bundled (a dependency loading code at runtime, a missing shim). Everything
+// here works without tokens or network: read-only commands, dry runs that end up with nothing to
+// build, and the missing-token error. The `CLI bundle` check keeps the bundle in sync with bin/.
+const bundlePath = fileURLToPath(new URL('../../.github/cli/apify-test-tools.mjs', import.meta.url));
+
+// Only what node and git need, so no Apify or Slack token from the developer's shell leaks in.
+const cliEnv = { PATH: process.env.PATH ?? '', HOME: os.tmpdir() };
+const gitEnv = {
+    ...cliEnv,
+    GIT_AUTHOR_NAME: 'Tester',
+    GIT_AUTHOR_EMAIL: 'tester@example.com',
+    GIT_COMMITTER_NAME: 'Tester',
+    GIT_COMMITTER_EMAIL: 'tester@example.com',
+};
+
+let repoDir: string;
+let baseSha: string;
+let headSha: string;
+
+const git = (...args: string[]) => execFileSync('git', args, { cwd: repoDir, env: gitEnv, encoding: 'utf8' }).trim();
+
+const writeRepoFile = async (file: string, content: string) => {
+    await mkdir(path.dirname(path.join(repoDir, file)), { recursive: true });
+    await writeFile(path.join(repoDir, file), content);
+};
+
+const runCli = (...args: string[]) => {
+    const result = spawnSync(process.execPath, [bundlePath, ...args], { cwd: repoDir, env: cliEnv, encoding: 'utf8' });
+    return { status: result.status, stdout: result.stdout, stderr: result.stderr };
+};
+
+const gitRange = ['--source-branch', 'feature', '--target-branch', 'main'];
+
+describe('CLI bundle', () => {
+    // Two Actors on `main`; `feature` changes only tester/foo and the root README.
+    beforeAll(async () => {
+        repoDir = await mkdtemp(path.join(os.tmpdir(), 'apify-cli-bundle-'));
+        git('init', '-q', '-b', 'main');
+        git('remote', 'add', 'origin', 'https://github.com/apify/fixture-repo.git');
+        for (const name of ['foo', 'bar']) {
+            await writeRepoFile(
+                `actors/${name}/.actor/actor.json`,
+                JSON.stringify({ actorSpecification: 1, name, version: '0.1' }),
+            );
+        }
+        await writeRepoFile(
+            'apify-test-tools.config.json',
+            JSON.stringify({
+                actors: [
+                    { folder: 'actors/foo', actorFullName: 'tester/foo', tokenEnvVar: 'FOO_TOKEN' },
+                    { folder: 'actors/bar', actorFullName: 'tester/bar', tokenEnvVar: 'BAR_TOKEN' },
+                ],
+            }),
+        );
+        git('add', '-A');
+        git('commit', '-q', '-m', 'chore: init');
+        baseSha = git('rev-parse', 'HEAD');
+
+        git('checkout', '-q', '-b', 'feature');
+        await writeRepoFile('actors/foo/main.js', 'console.log("changed");\n');
+        git('add', '-A');
+        git('commit', '-q', '-m', 'fix(foo): change foo');
+        await writeRepoFile('README.md', 'readme\n');
+        git('add', '-A');
+        git('commit', '-q', '-m', 'docs: readme');
+        headSha = git('rev-parse', 'HEAD');
+    });
+
+    afterAll(async () => {
+        if (repoDir) await rm(repoDir, { recursive: true, force: true });
+    });
+
+    it('lists every command in --help', () => {
+        const { status, stdout } = runCli('--help');
+        expect(status).toBe(0);
+        for (const command of [
+            'get-commits',
+            'get-latest-commit',
+            'get-changed-files',
+            'get-actor-configs',
+            'get-affected-actors',
+            'report-tests',
+            'build',
+            'release',
+            'build-from-local',
+            'delete-old-builds',
+        ]) {
+            expect(stdout).toContain(command);
+        }
+    });
+
+    it('get-commits returns the commits on the source branch', () => {
+        const { status, stdout, stderr } = runCli('get-commits', ...gitRange);
+        expect(status, stderr).toBe(0);
+        expect(JSON.parse(stdout).map((commit: { message: string }) => commit.message)).toEqual([
+            'fix(foo): change foo',
+            'docs: readme',
+        ]);
+    });
+
+    it('get-latest-commit returns the head of the source branch', () => {
+        const { status, stdout, stderr } = runCli('get-latest-commit', ...gitRange);
+        expect(status, stderr).toBe(0);
+        expect(JSON.parse(stdout)).toMatchObject({ sha: headSha, message: 'docs: readme' });
+    });
+
+    it('get-changed-files returns the files changed on the source branch', () => {
+        const { status, stdout, stderr } = runCli('get-changed-files', ...gitRange);
+        expect(status, stderr).toBe(0);
+        expect(JSON.parse(stdout)).toEqual(['README.md', 'actors/foo/main.js']);
+    });
+
+    it('get-actor-configs reads both Actors from the config file', () => {
+        const { status, stdout, stderr } = runCli('get-actor-configs');
+        expect(status, stderr).toBe(0);
+        expect(JSON.parse(stdout).map((actor: { actorFullName: string }) => actor.actorFullName)).toEqual([
+            'tester/foo',
+            'tester/bar',
+        ]);
+    });
+
+    it('get-affected-actors returns only the Actor whose files changed', () => {
+        // `feature` is checked out, and the range always ends at HEAD
+        const { status, stdout, stderr } = runCli('get-affected-actors', '--base', 'main');
+        expect(status, stderr).toBe(0);
+        expect(JSON.parse(stdout)).toMatchObject({
+            version: 1,
+            head: headSha,
+            functionallyChangedActors: [{ actorFullName: 'tester/foo' }],
+            // The root README isn't in tester/bar's folder, so it doesn't count for it
+            cosmeticallyChangedActors: [],
+        });
+    });
+
+    it('build --dry-run with nothing to build needs no token', () => {
+        const { status, stdout, stderr } = runCli('build', ...gitRange, '--actors', 'tester/bar', '--dry-run');
+        expect(status, stderr).toBe(0);
+        expect(JSON.parse(stdout)).toEqual({ dryRun: true, builds: [] });
+    });
+
+    it('build --dry-run fails cleanly when the Actor token is missing', () => {
+        const { status, stderr } = runCli('build', ...gitRange, '--dry-run');
+        expect(status).toBe(1);
+        expect(stderr).toContain('Env var FOO_TOKEN is not set (needed for actor "tester/foo")');
+    });
+
+    it('release --dry-run stops when HEAD is the base commit', () => {
+        const { status, stderr } = runCli('release', '--base-commit', headSha, '--dry-run');
+        expect(status, stderr).toBe(0);
+        expect(stderr).toContain(`HEAD is the base commit ${headSha}, there is nothing new to release`);
+    });
+
+    it('release --dry-run with nothing to build skips Slack without a token', () => {
+        const { status, stderr } = runCli('release', '--base-commit', baseSha, '--actors', 'tester/bar', '--dry-run');
+        expect(status, stderr).toBe(0);
+        expect(stderr).toContain('{"dryRun":true,"builds":[]}');
+        expect(stderr).toContain('Skipping slack notification');
+    });
+
+    it('report-tests summarizes a vitest JSON report', async () => {
+        const assertion = (title: string, status: 'passed' | 'failed', runId: string) => ({
+            ancestorTitles: [],
+            fullName: `foo ${title}`,
+            title,
+            status,
+            failureMessages: status === 'failed' ? ['AssertionError: expected 1 to be 2\n    at foo.test.ts:1:1'] : [],
+            meta: { runId, runLink: `https://console.apify.com/view/runs/${runId}`, actorId: 'tester/foo' },
+        });
+        await writeRepoFile(
+            'test-output.json',
+            JSON.stringify({
+                success: false,
+                testResults: [
+                    {
+                        name: 'test/platform/foo.test.ts',
+                        status: 'failed',
+                        assertionResults: [assertion('works', 'passed', 'run1'), assertion('fails', 'failed', 'run2')],
+                    },
+                ],
+            }),
+        );
+
+        const { status, stderr } = runCli('report-tests', '--report-file', 'test-output.json', '--dry-run');
+        expect(status, stderr).toBe(0);
+        expect(stderr).toContain('PASSED: 1, FAILED: 1');
+        expect(stderr).toContain('1) foo fails ... https://console.apify.com/view/runs/run2');
+        expect(stderr).toContain('Skipping slack notification');
+    });
+});

package/test/e2e/cli-bundle.e2e.test.ts

@@ -0,0 +1,237 @@
+import { execFileSync, spawnSync } from 'node:child_process';
+import { mkdir, mkdtemp, readFile, rm, symlink, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+
+import { ApifyClient } from 'apify-client';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+
+// End-to-end run of the shipped CLI bundle against two dummy Actors in an isolated sandbox account:
+// dry-run plans read the real Actors, `build-from-local` really builds them, the lib runs them
+// through `testActor` on exactly those builds (the ACTOR_BUILDS handoff), `report-tests` reads the
+// result, and `delete-old-builds` cleans up. Git builds (`build`/`release` without --dry-run) are
+// not covered: the Apify builder would have to clone the fixture repo, which only exists locally.
+//
+// Runs with `npm run test:e2e`, kept out of `npm test`. Skipped without the token, e.g. on fork PRs.
+const TOKEN_ENV_VAR = 'E2E_TEST_APIFY_TOKEN_DBYPODOIHUZABNQTR';
+const token = process.env[TOKEN_ENV_VAR];
+
+const ACTORS = ['test-tools-testing-sandbox/dummy-for-testing-1', 'test-tools-testing-sandbox/dummy-for-testing-2'];
+// Only used as the source URL in dry-run plans; nothing is cloned from it.
+const REPO_URL = 'https://github.com/apify/apify-test-tools-e2e-fixture';
+
+const projectRoot = fileURLToPath(new URL('../../', import.meta.url));
+const bundlePath = path.join(projectRoot, '.github/cli/apify-test-tools.mjs');
+const vitestPath = path.join(projectRoot, 'node_modules/vitest/vitest.mjs');
+
+// Proxy and CA settings pass through so the API is reachable behind a proxy; no other variable does.
+const networkEnv = Object.fromEntries(
+    ['HTTPS_PROXY', 'https_proxy', 'HTTP_PROXY', 'http_proxy', 'NO_PROXY', 'no_proxy', 'NODE_EXTRA_CA_CERTS']
+        .filter((name) => process.env[name] !== undefined)
+        .map((name) => [name, process.env[name]!]),
+);
+const baseEnv = { PATH: process.env.PATH ?? '', HOME: os.tmpdir() };
+// The CLI gets only the sandbox token, under the name the fixture config points at.
+const cliEnv = { ...baseEnv, ...networkEnv, [TOKEN_ENV_VAR]: token ?? '' };
+const gitEnv = {
+    ...baseEnv,
+    GIT_AUTHOR_NAME: 'Tester',
+    GIT_AUTHOR_EMAIL: 'tester@example.com',
+    GIT_COMMITTER_NAME: 'Tester',
+    GIT_COMMITTER_EMAIL: 'tester@example.com',
+};
+
+let repoDir: string;
+let baseSha: string;
+
+const git = (...args: string[]) => execFileSync('git', args, { cwd: repoDir, env: gitEnv, encoding: 'utf8' }).trim();
+
+const writeRepoFile = async (file: string, content: string) => {
+    await mkdir(path.dirname(path.join(repoDir, file)), { recursive: true });
+    await writeFile(path.join(repoDir, file), content);
+};
+
+// Spawned processes are blocking, so vitest's own timeouts can't stop one that hangs. apify-client
+// retries an unreachable API for minutes, so a hang is killed here and fails with a clear error.
+const PROCESS_TIMEOUT_MS = 8 * 60_000;
+
+const runCli = (...args: string[]) => {
+    const result = spawnSync(process.execPath, [bundlePath, ...args], {
+        cwd: repoDir,
+        env: cliEnv,
+        encoding: 'utf8',
+        timeout: PROCESS_TIMEOUT_MS,
+    });
+    const error = result.error ? `\n${result.error.message}` : '';
+    return { status: result.status, stdout: result.stdout, stderr: result.stderr + error };
+};
+
+interface ActorBuild {
+    buildId: string;
+    actorRawId: string;
+    buildNumber: string;
+    actorFullName: string;
+}
+
+describe.runIf(token)('CLI bundle against real Actors', { timeout: 2 * 60_000 }, () => {
+    let builds: ActorBuild[];
+
+    // Both Actors on `main`; `feature` changes only dummy-for-testing-1.
+    beforeAll(async () => {
+        repoDir = await mkdtemp(path.join(os.tmpdir(), 'apify-cli-e2e-'));
+        git('init', '-q', '-b', 'main');
+        git('remote', 'add', 'origin', `${REPO_URL}.git`);
+        const actors = [];
+        for (const [i, actorFullName] of ACTORS.entries()) {
+            const folder = `actors/dummy-${i + 1}`;
+            await writeRepoFile(
+                `${folder}/.actor/actor.json`,
+                JSON.stringify({
+                    actorSpecification: 1,
+                    name: actorFullName.split('/')[1],
+                    version: '0.0',
+                    dockerfile: '../Dockerfile',
+                }),
+            );
+            await writeRepoFile(
+                `${folder}/Dockerfile`,
+                'FROM apify/actor-node:22\nCOPY . ./\nCMD ["node", "main.js"]\n',
+            );
+            await writeRepoFile(`${folder}/main.js`, `console.log('dummy ${i + 1}');\n`);
+            actors.push({ folder, actorFullName, tokenEnvVar: TOKEN_ENV_VAR });
+        }
+        await writeRepoFile('apify-test-tools.config.json', JSON.stringify({ actors }));
+        git('add', '-A');
+        git('commit', '-q', '-m', 'chore: init');
+        baseSha = git('rev-parse', 'HEAD');
+
+        git('checkout', '-q', '-b', 'feature');
+        await writeRepoFile('actors/dummy-1/main.js', "console.log('dummy 1 changed');\n");
+        git('add', '-A');
+        git('commit', '-q', '-m', 'fix(dummy-1): change');
+    });
+
+    afterAll(async () => {
+        if (repoDir) await rm(repoDir, { recursive: true, force: true });
+    });
+
+    it('build --dry-run plans a test build of the changed Actor only', () => {
+        const { status, stdout, stderr } = runCli(
+            'build',
+            '--source-branch',
+            'feature',
+            '--target-branch',
+            'main',
+            '--repo-url',
+            REPO_URL,
+            '--dry-run',
+        );
+        expect(status, stderr).toBe(0);
+        expect(JSON.parse(stdout)).toEqual({
+            dryRun: true,
+            builds: [
+                {
+                    actorFullName: ACTORS[0],
+                    versionNumber: '0.99',
+                    gitRepoUrl: `${REPO_URL}#feature:actors/dummy-1`,
+                    useDockerCache: false,
+                },
+            ],
+        });
+    });
+
+    it('release --dry-run plans a build of the default version and tag', () => {
+        const { status, stderr } = runCli('release', '--base-commit', baseSha, '--repo-url', REPO_URL, '--dry-run');
+        expect(status, stderr).toBe(0);
+        expect(stderr).toContain(
+            `[DRY RUN] Would build:\n  ${ACTORS[0]} (0.0) from ${REPO_URL}#feature:actors/dummy-1`,
+        );
+        expect(stderr).toContain('Skipping slack notification');
+    });
+
+    it('build-from-local --dry-run plans both Actors from the working tree', () => {
+        const { status, stdout, stderr } = runCli('build-from-local', '--dry-run');
+        expect(status, stderr).toBe(0);
+        expect(JSON.parse(stdout)).toMatchObject({
+            dryRun: true,
+            builds: ACTORS.map((actorFullName) => ({ actorFullName, versionNumber: '0.98', fileCount: 3 })),
+        });
+    });
+
+    it('build-from-local builds both Actors', { timeout: 10 * 60_000 }, () => {
+        const { status, stdout, stderr } = runCli('build-from-local');
+        expect(status, stderr).toBe(0);
+        builds = JSON.parse(stdout);
+        expect(builds.map((build) => build.actorFullName)).toEqual(ACTORS);
+        for (const build of builds) expect(build.buildNumber).toMatch(/^0\.98\.\d+$/);
+    });
+
+    it('runs the builds through testActor and reports the results', { timeout: 10 * 60_000 }, async () => {
+        expect(builds, 'needs the builds from the previous test').toBeDefined();
+
+        // A consumer's platform test, importing the lib from this checkout. The symlink lets it
+        // resolve vitest and the lib's dependencies the way an installed package would.
+        await symlink(path.join(projectRoot, 'node_modules'), path.join(repoDir, 'node_modules'), 'dir');
+        const libPath = path.join(projectRoot, 'index.ts');
+        const actorTests = ACTORS.map(
+            (actorId) => `
+    testActor(${JSON.stringify(actorId)}, 'finishes', async ({ expect, run }) => {
+        const result = await run({ input: {} });
+        expect(result.status).toBe('SUCCEEDED');
+    });`,
+        ).join('\n');
+        await writeRepoFile(
+            'test/platform/dummies.test.ts',
+            `import { describe, testActor } from ${JSON.stringify(libPath)};
+
+describe('sandbox dummies', () => {${actorTests}
+});
+`,
+        );
+
+        const vitest = spawnSync(
+            process.execPath,
+            [vitestPath, 'run', 'test/platform', '--reporter=json', '--outputFile=./test-output.json'],
+            {
+                cwd: repoDir,
+                encoding: 'utf8',
+                timeout: PROCESS_TIMEOUT_MS,
+                env: { ...cliEnv, TESTER_APIFY_TOKEN: token, ACTOR_BUILDS: JSON.stringify(builds) },
+            },
+        );
+        expect(
+            vitest.status,
+            `${vitest.stdout}\n${vitest.stderr}${vitest.error ? `\n${vitest.error.message}` : ''}`,
+        ).toBe(0);
+
+        // Each run used the build from ACTOR_BUILDS, not the Actor's default build.
+        const report = JSON.parse(await readFile(path.join(repoDir, 'test-output.json'), 'utf8'));
+        const assertions = report.testResults.flatMap(
+            (file: { assertionResults: { meta: { runId: string } }[] }) => file.assertionResults,
+        );
+        expect(assertions).toHaveLength(ACTORS.length);
+        const client = new ApifyClient({ token });
+        const runBuildIds = await Promise.all(
+            assertions.map(
+                async ({ meta }: { meta: { runId: string } }) => (await client.run(meta.runId).get())?.buildId,
+            ),
+        );
+        expect(runBuildIds.sort()).toEqual(builds.map((build) => build.buildId).sort());
+
+        const { status, stderr } = runCli('report-tests', '--report-file', 'test-output.json', '--dry-run');
+        expect(status, stderr).toBe(0);
+        expect(stderr).toContain(`PASSED: ${ACTORS.length}, FAILED: 0`);
+        expect(stderr).toContain('https://console.apify.com/view/runs/');
+    });
+
+    // Last, so builds from earlier runs of this suite don't pile up in the sandbox.
+    it('delete-old-builds keeps the default builds', () => {
+        const { status, stderr } = runCli('delete-old-builds');
+        expect(status, stderr).toBe(0);
+        for (const actorFullName of ACTORS) {
+            expect(stderr).toContain(`[DELETE OLD BUILDS][${actorFullName}]: Skipping default build`);
+        }
+    });
+});

package/test/unit/bin/affected-actors.test.ts

@@ -0,0 +1,190 @@
+import type { MockInstance } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { getAffectedActors, toAffectedActorsDocument } from '../../../bin/affected-actors.js';
+import * as DiffChanges from '../../../bin/diff-changes.js';
+import * as Git from '../../../bin/git.js';
+import type { ActorConfig, Commit } from '../../../bin/types.js';
+import * as LoadConfig from '../../../bin/utils/config/load-config.js';
+
+// Everything that reads the configs is mocked, so only the identity and name of an Actor matter here
+const actorA = { actorFullName: 'owner/a' } as ActorConfig;
+const actorB = { actorFullName: 'owner/b' } as ActorConfig;
+
+const headSha = 'f'.repeat(40);
+const sinceSha = '5'.repeat(40);
+const commit = (sha: string): Commit => ({ sha, author: 'Dev<dev@example.com>', date: 'Date', message: 'msg' });
+const commits = [commit('1'.repeat(40)), commit('2'.repeat(40))];
+const changedFiles = ['src/main.ts', 'CHANGELOG.md'];
+
+const selection = { actors: [], ignore: [] };
+
+describe('getAffectedActors', () => {
+    let changedActorsSpy: MockInstance;
+
+    beforeEach(() => {
+        vi.spyOn(LoadConfig, 'readConfigFile').mockResolvedValue([actorA, actorB]);
+        changedActorsSpy = vi
+            .spyOn(DiffChanges, 'getChangedActors')
+            .mockResolvedValue({ functional: [actorA], cosmetic: [actorB] });
+        vi.spyOn(Git, 'resolveCommitSha').mockResolvedValue(headSha);
+        vi.spyOn(Git, 'resolveBranchName').mockResolvedValue('feature');
+        vi.spyOn(Git, 'getChangedFilesBetween').mockResolvedValue(changedFiles);
+        vi.spyOn(Git, 'getChangelogAdditions').mockResolvedValue('- Added foo');
+    });
+
+    it('requires --base or --since', async () => {
+        const options = { head: 'HEAD', ...selection };
+        await expect(getAffectedActors(options)).rejects.toThrow('Pass --base, --since, or both');
+        // An empty --since (e.g. from an empty cache file) counts as not passed
+        await expect(getAffectedActors({ ...options, since: '' })).rejects.toThrow('Pass --base, --since, or both');
+    });
+
+    describe('with --base', () => {
+        let getCommitsSpy: MockInstance;
+
+        beforeEach(() => {
+            vi.spyOn(Git, 'hasMergeFromTarget').mockResolvedValue(false);
+            getCommitsSpy = vi.spyOn(Git, 'getCommits').mockResolvedValue(commits);
+        });
+
+        it('inspects the branch commits after --since', async () => {
+            const result = await getAffectedActors({
+                head: 'origin/feature',
+                base: 'origin/master',
+                since: sinceSha,
+                ...selection,
+            });
+
+            expect(result).toStrictEqual({
+                headSha,
+                ref: 'feature',
+                commits,
+                changedFiles,
+                changelog: '- Added foo',
+                functionallyChangedActors: [actorA],
+                cosmeticallyChangedActors: [actorB],
+            });
+            expect(getCommitsSpy).toHaveBeenCalledWith({
+                sourceBranch: 'origin/feature',
+                targetBranch: 'origin/master',
+                baseCommit: sinceSha,
+            });
+            // From the parent of the oldest commit to the newest one, for the files and the changelog alike
+            expect(Git.getChangedFilesBetween).toHaveBeenCalledWith(`${commits[0].sha}~`, commits[1].sha);
+            expect(Git.getChangelogAdditions).toHaveBeenCalledWith(`${commits[0].sha}~`, commits[1].sha, changedFiles);
+            expect(changedActorsSpy).toHaveBeenCalledWith({
+                filepathsChanged: changedFiles,
+                actorConfigs: [actorA, actorB],
+                commits,
+            });
+        });
+
+        describe('when the branch merged --base in', () => {
+            beforeEach(() => {
+                vi.spyOn(Git, 'hasMergeFromTarget').mockResolvedValue(true);
+                vi.spyOn(Git, 'getBranchOnlyChangedFiles').mockResolvedValue(['own-file']);
+            });
+
+            const getWithOwnChanges = async (own: DiffChanges.ChangedActors) => {
+                changedActorsSpy.mockImplementation(async ({ filepathsChanged }) =>
+                    filepathsChanged[0] === 'own-file' ? own : { functional: [actorA], cosmetic: [actorB] },
+                );
+                return getAffectedActors({ head: 'feature', base: 'master', since: sinceSha, ...selection });
+            };
+
+            it("classifies the branch's own files against the whole branch, ignoring --since", async () => {
+                await getWithOwnChanges({ functional: [actorA], cosmetic: [] });
+                expect(changedActorsSpy).toHaveBeenCalledWith({
+                    filepathsChanged: ['own-file'],
+                    actorConfigs: [actorA, actorB],
+                    commits,
+                });
+                expect(getCommitsSpy).toHaveBeenCalledWith({ sourceBranch: 'feature', targetBranch: 'master' });
+            });
+
+            it('reports everything when the branch has functional changes of its own', async () => {
+                const result = await getWithOwnChanges({ functional: [actorA], cosmetic: [] });
+                expect(result.functionallyChangedActors).toStrictEqual([actorA]);
+                expect(result.cosmeticallyChangedActors).toStrictEqual([actorB]);
+            });
+
+            it('reports only cosmetic Actors when its own changes are only cosmetic', async () => {
+                const result = await getWithOwnChanges({ functional: [], cosmetic: [actorB] });
+                expect(result.functionallyChangedActors).toStrictEqual([]);
+                expect(result.cosmeticallyChangedActors).toStrictEqual([actorB]);
+            });
+
+            it('reports nothing when it has no changes of its own', async () => {
+                const result = await getWithOwnChanges({ functional: [], cosmetic: [] });
+                expect(result.functionallyChangedActors).toStrictEqual([]);
+                expect(result.cosmeticallyChangedActors).toStrictEqual([]);
+                // The range is still reported
+                expect(result.commits).toStrictEqual(commits);
+            });
+        });
+    });
+
+    describe('with --since only', () => {
+        let resolveBaseSpy: MockInstance;
+        let commitsBetweenSpy: MockInstance;
+
+        beforeEach(() => {
+            resolveBaseSpy = vi.spyOn(Git, 'resolveReleaseBaseCommit').mockResolvedValue(sinceSha);
+            commitsBetweenSpy = vi.spyOn(Git, 'getCommitsBetween').mockResolvedValue(commits);
+        });
+
+        it('inspects everything after --since up to --head', async () => {
+            const result = await getAffectedActors({ head: 'release', since: 'HEAD~2', ...selection });
+
+            expect(result).toStrictEqual({
+                headSha,
+                ref: 'feature',
+                commits,
+                changedFiles,
+                changelog: '- Added foo',
+                functionallyChangedActors: [actorA],
+                cosmeticallyChangedActors: [actorB],
+            });
+            expect(resolveBaseSpy).toHaveBeenCalledWith('HEAD~2', 'release');
+            expect(commitsBetweenSpy).toHaveBeenCalledWith(sinceSha, headSha);
+            expect(Git.getChangedFilesBetween).toHaveBeenCalledWith(sinceSha, headSha);
+            expect(Git.getChangelogAdditions).toHaveBeenCalledWith(sinceSha, headSha, changedFiles);
+        });
+
+        it('has no commits when head is the --since commit', async () => {
+            resolveBaseSpy.mockResolvedValue(headSha);
+
+            const result = await getAffectedActors({ head: 'HEAD', since: headSha, ...selection });
+
+            expect(result.commits).toStrictEqual([]);
+            // Empty `git log x..x` output doesn't parse as a commit, so it's never run
+            expect(commitsBetweenSpy).not.toHaveBeenCalled();
+        });
+    });
+});
+
+describe('toAffectedActorsDocument', () => {
+    it('keeps only the Actor names, the config file stays the source of truth for the rest', () => {
+        expect(
+            toAffectedActorsDocument({
+                headSha,
+                ref: null,
+                commits,
+                changedFiles: ['src/main.ts'],
+                changelog: null,
+                functionallyChangedActors: [actorA],
+                cosmeticallyChangedActors: [actorB],
+            }),
+        ).toStrictEqual({
+            version: 1,
+            ref: null,
+            head: headSha,
+            commits,
+            changedFiles: ['src/main.ts'],
+            changelog: null,
+            functionallyChangedActors: [{ actorFullName: 'owner/a' }],
+            cosmeticallyChangedActors: [{ actorFullName: 'owner/b' }],
+        });
+    });
+});