Merge pull request #12606 from backstage/rugvip/win

scaffolder-backend: fix template fetch test on windows

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'));
       });
     });
 

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' },