From 65dc489881c6b6e2fed5f537b233f297c58e5cde Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 13 Jul 2022 11:13:17 +0200 Subject: [PATCH 1/2] scaffolder-backend: fix template fetch test on windows Signed-off-by: Patrik Oldsberg --- .../src/scaffolder/actions/builtin/fetch/template.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts index 2557f365f3..3e4ad61260 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts @@ -354,7 +354,7 @@ describe('fetch:template', () => { await expect( fs.realpath(`${workspacePath}/target/symlink`), - ).resolves.toBe(`${workspacePath}/target/a-binary-file.png`); + ).resolves.toBe(joinPath(workspacePath, 'target', 'a-binary-file.png')); }); }); From 02842ba0fdca852398644f2f4140c094bd9fd109 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 13 Jul 2022 11:16:30 +0200 Subject: [PATCH 2/2] scaffolder-backend: fix gerrit publish test on windows Signed-off-by: Patrik Oldsberg --- .../src/scaffolder/actions/builtin/publish/gerrit.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.test.ts index bb1beba791..a223dec4f6 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.test.ts @@ -16,6 +16,7 @@ jest.mock('../helpers'); +import path from 'path'; import { createPublishGerritAction } from './gerrit'; import { rest } from 'msw'; import { setupServer } from 'msw/node'; @@ -169,7 +170,7 @@ describe('publish:gerrit', () => { }); expect(initRepoAndPush).toHaveBeenCalledWith({ - dir: `${mockContext.workspacePath}/repository/`, + dir: `${mockContext.workspacePath}${path.sep}repository${path.sep}`, remoteUrl: 'https://gerrithost.org/a/repo', defaultBranch: 'master', auth: { username: 'gerrituser', password: 'usertoken' },