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

package/lib/lib.ts

@@ -92,29 +92,24 @@ export const testStandbyActor = <I = any, O = any>(
 
     vitestTest.runIf(shouldRun)(name, options, async <T extends TestContext>(context: T) => {
         const standbyTask = await createStandbyTask(actorName, config.get(actorName)?.buildNumber);
-        const { annotate } = context;
         const { expect, ...rest } = context;
 
-        // NOTE: we need to wrap `fn` in try-catch so that we can always clean up (delete the task) afterwards
+        // NOTE: we wrap `fn` in try/finally so cleanup (deleting the task) always runs afterwards
         try {
             await fn({
                 expect: extendExpect(expect),
-                callStandby: createStartStandbyFn(standbyTask),
+                callStandby: createStartStandbyFn(standbyTask, context, name),
                 ...rest,
             });
-        } catch {
-            /* */
-        }
-
-        const { taskId } = standbyTask;
-        const runs = (await apifyClient.task(taskId).runs().list()).items;
-        for (const run of runs) {
-            const runLink = generateRunLink(run);
-            await annotate(`${name} - ${runLink}`, 'run_link');
-        }
-
-        if (taskId) {
-            await apifyClient.task(taskId).delete();
+        } finally {
+            const { taskId } = standbyTask;
+            // we want to delete the task at the end of the test
+            await apifyClient
+                .task(taskId)
+                .delete()
+                .catch((error) => {
+                    console.error(`Failed to delete standby task "${taskId}": ${error}`);
+                });
         }
     });
 };
@@ -129,7 +124,7 @@ export const testTestActor = <T>(
             expect: extendExpect(expect),
             // @ts-expect-error: this just to test custom matchers
             // eslint-disable-next-line @typescript-eslint/no-empty-function
-            run: () => {},
+            run: () => { },
             ...rest,
         });
     });
@@ -138,20 +133,44 @@ export const testTestActor = <T>(
 export const it = testActor;
 
 /**
- * Creates a function the accepts input for a standby actor and sends request containing input
+ * Creates a function that accepts input for a standby actor and sends a request containing the input
  * to the task's standby url.
  */
-const createStartStandbyFn = <I, O>(standbyTask: StandbyTask) => {
-    const { standbyUrl } = standbyTask;
-    return async ({ input }: Pick<RunOptions<I>, 'input'>) => {
-        const response = await fetch(standbyUrl, {
+const createStartStandbyFn = <I, O>(standbyTask: StandbyTask, { annotate }: TestContext, testName: string) => {
+    const { standbyUrl, taskId } = standbyTask;
+    const annotatedRuns = new Set<string>();
+
+    // We annotate all the runs of the task, though it will be only one run
+    // for most of the tests. To avoid annotating the same run multiple times
+    // (in case the test calls the standby more than once), we use `annotatedRuns`
+    // set to keep track of which runs have already been annotated.
+    const annotateStandbyRuns = async () => {
+        const runs = (await apifyClient.task(taskId).runs().list()).items;
+        for (const run of runs) {
+            if (!annotatedRuns.has(run.id)) {
+                const runLink = generateRunLink(run);
+                await annotate(`${testName} - ${runLink}`, 'run_link');
+            }
+            annotatedRuns.add(run.id);
+        }
+    };
+
+    return async ({
+        input,
+        path = '',
+        headers = {},
+    }: Pick<RunOptions<I>, 'input'> & { path?: string; headers?: Record<string, string> }) => {
+        const response = await fetch(standbyUrl + path, {
             headers: {
+                ...headers,
                 Authorization: `Bearer ${apifyClient.token}`,
             },
             method: 'POST',
             body: JSON.stringify(input),
         });
 
+        await annotateStandbyRuns();
+
         const data = (await response.json()) as O;
         return {
             data,
@@ -166,10 +185,6 @@ interface StandbyTask {
     taskId: string;
 }
 
-const randomInt = (min: number, max: number) => {
-    return Math.floor(Math.random() * (max - min + 1)) + min;
-};
-
 /**
  * Creates a task with specific `build` - either `buildNumber` or default.
  *
@@ -201,16 +216,15 @@ const createStandbyTask = async (actorNameOrId: string, buildNumber?: string): P
     };
 
     try {
-        const title = `Test task - ${build}:${actorNameOrId}`.slice(0, 62);
+        const title = `Test task - ${build}`.slice(0, 62);
+        const randomValueLength = 15;
         // we try to create unique task name containing only `a-z0-9-` characters and at most 63 characters long
-        const name = `${randomInt(1, 1_000_000)}${title
-            .toLowerCase()
-            .replaceAll(/\s+/g, '')
-            .replaceAll(/[^a-z0-9-]+/g, '-')}`.slice(0, 62);
+        const randomValue = Math.random().toString(10).slice(2).padEnd(randomValueLength, '0');
+        const name = `test-${randomValue.slice(0, randomValueLength)}`;
         const newTask = (await apifyClient.tasks().create({
             actId: actorNameOrId,
             actorStandby: actorStandbyOptions,
-            description: `Task for testing standby version ${build}`,
+            description: `Task for testing standby version ${build} of actor "${actorNameOrId}"`,
             title,
             name,
         })) as Task & { standbyUrl?: string };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-test-tools",
-  "version": "0.6.4-beta.0",
+  "version": "0.6.4-beta.2",
   "type": "module",
   "description": "TBD",
   "repository": {

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

@@ -1,13 +1,7 @@
 import type { MockInstance } from 'vitest';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import {
-    getBranchOnlyChangedFiles,
-    getChangedFiles,
-    getCommits,
-    hasMergeFromTarget,
-    parseBaseCommit,
-} from '../../../bin/git.js';
+import { getChangedFiles, getCommits, parseBaseCommit } from '../../../bin/git.js';
 import * as Utils from '../../../bin/utils.js';
 
 describe('getCommits', () => {
@@ -123,86 +117,6 @@ 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' });