Merge 8461cead75 into 0c366fd6a8

__test__/git-auth-helper.test.ts

@@ -22,11 +22,6 @@ let settings: IGitSourceSettings
 let sshPath: string
 let githubServerUrl: string
 
-// Helper function to normalize path separators to forward slashes
-function convertBackslashes(file: string): string {
-  return file.replace(/\\/g, '/')
-}
-
 describe('git-auth-helper tests', () => {
   beforeAll(async () => {
     // SSH
@@ -266,8 +261,7 @@ describe('git-auth-helper tests', () => {
       await fs.promises.symlink(workspace, symlinkPath)
 
       // Make git appear to be operating from the symlink path
-      const mockGetWorkingDirectory = git.getWorkingDirectory as jest.Mock
+      ;(git.getWorkingDirectory as jest.Mock).mockReturnValue(symlinkPath)
-      mockGetWorkingDirectory.mockReturnValue(symlinkPath)
       process.env['GITHUB_WORKSPACE'] = symlinkPath
 
       const authHelper = gitAuthHelper.createAuthHelper(git, settings)
@@ -279,10 +273,10 @@ describe('git-auth-helper tests', () => {
       const localConfigContent = (
         await fs.promises.readFile(localGitConfigPath)
       ).toString()
-      const realGitDir = convertBackslashes(
+      const realGitDir = (
         await fs.promises.realpath(path.join(symlinkPath, '.git'))
-      )
+      ).replace(/\\/g, '/')
-      const symlinkGitDir = convertBackslashes(path.join(symlinkPath, '.git'))
+      const symlinkGitDir = path.join(symlinkPath, '.git').replace(/\\/g, '/')
 
       expect(realGitDir).not.toBe(symlinkGitDir) // sanity check: paths differ
       expect(
@@ -301,11 +295,10 @@ describe('git-auth-helper tests', () => {
     // Arrange
     await setup(configureAuth_fallsBackWhenRealpathSyncFails)
 
-    // Use a nonexistent path so realpathSync throws ENOENT naturally,
+    // Use a non-existent path so realpathSync throws ENOENT naturally,
     // exercising the catch fallback in configureToken()
     const nonexistentPath = path.join(runnerTemp, 'does-not-exist')
-    const mockGetWorkingDirectory = git.getWorkingDirectory as jest.Mock
+    ;(git.getWorkingDirectory as jest.Mock).mockReturnValue(nonexistentPath)
-    mockGetWorkingDirectory.mockReturnValue(nonexistentPath)
 
     const authHelper = gitAuthHelper.createAuthHelper(git, settings)
 
@@ -316,9 +309,9 @@ describe('git-auth-helper tests', () => {
     const localConfigContent = (
       await fs.promises.readFile(localGitConfigPath)
     ).toString()
-    const fallbackGitDir = convertBackslashes(
+    const fallbackGitDir = path
-      path.join(nonexistentPath, '.git')
+      .join(nonexistentPath, '.git')
-    )
+      .replace(/\\/g, '/')
     expect(
       localConfigContent.indexOf(`includeIf.gitdir:${fallbackGitDir}.path`)
     ).toBeGreaterThanOrEqual(0)