From 97497d056a3dfd8f8f3ff97293ea8b856f18d8fb Mon Sep 17 00:00:00 2001
From: Bogdan Nechyporenko <bnechyporenko@bol.com>
Date: Thu, 30 Jan 2025 22:22:53 +0100
Subject: [PATCH] wip

Signed-off-by: Bogdan Nechyporenko <bnechyporenko@bol.com>
---
 .../src/actions/gitlabMergeRequest.test.ts               | 7 +++++--
 .../src/actions/mockActionContext.ts                     | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
index 874764b5ba..4e16445544 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
@@ -48,7 +48,7 @@ const mockGitlabClient = {
     }),
   },
   Commits: {
-    create: jest.fn(),
+    create: jest.fn(() => ({ id: 'mockId' })),
   },
   MergeRequests: {
     create: jest.fn(async (repoId: string) => {
@@ -267,7 +267,10 @@ describe('createGitLabMergeRequest', () => {
           irrelevant: { 'bar.txt': 'Nothing to see here' },
         },
       });
-      const ctx = createMockActionContext({ input, workspacePath });
+      const ctx = createMockActionContext({
+        input,
+        workspacePath,
+      });
       await instance.handler(ctx);
 
       expect(mockGitlabClient.Projects.show).not.toHaveBeenCalled();
diff --git a/plugins/scaffolder-node-test-utils/src/actions/mockActionContext.ts b/plugins/scaffolder-node-test-utils/src/actions/mockActionContext.ts
index 1d45051753..076bb0ce22 100644
--- a/plugins/scaffolder-node-test-utils/src/actions/mockActionContext.ts
+++ b/plugins/scaffolder-node-test-utils/src/actions/mockActionContext.ts
@@ -21,7 +21,7 @@ import {
   mockCredentials,
   mockServices,
 } from '@backstage/backend-test-utils';
-import { JsonObject } from '@backstage/types';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { ActionContext } from '@backstage/plugin-scaffolder-node';
 
 /**
@@ -43,7 +43,12 @@ export const createMockActionContext = <
     output: jest.fn(),
     createTemporaryDirectory: jest.fn(),
     input: {} as TActionInput,
-    checkpoint: jest.fn(),
+    async checkpoint<T extends JsonValue | void>(opts: {
+      key: string;
+      fn: () => Promise<T> | T;
+    }): Promise<T> {
+      return opts.fn();
+    },
     getInitiatorCredentials: () => Promise.resolve(credentials),
     task: {
       id: 'mock-task-id',