Skip to content

Commit

Permalink
change: remove path.sep, add unit tests, dist
Browse files Browse the repository at this point in the history
Remove path.sep during comparison with repositoryPath
(did not take in account root folders)
Updated and added more unit tests
Updated dist/index.js
  • Loading branch information
accodev committed Apr 25, 2024
1 parent 21ffcee commit 8461fff
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
1 change: 0 additions & 1 deletion __test__/git-auth-helper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,6 @@ async function setup(testName: string): Promise<void> {
workflowOrganizationId: 123456,
setSafeDirectory: true,
githubServerUrl: githubServerUrl,
workingDirectory: undefined
}
}

Expand Down
21 changes: 21 additions & 0 deletions __test__/input-helper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,25 @@ describe('input-helper tests', () => {
const settings: IGitSourceSettings = await inputHelper.getInputs()
expect(settings.workflowOrganizationId).toBe(123456)
})

it('sets a different working directory', async() => {
inputs['working-directory'] = '/home/user/test'
inputs['path'] = 'path/to/repo'
const settings: IGitSourceSettings = await inputHelper.getInputs()
expect(settings.repositoryPath).toBe(path.resolve('/home/user/test/path/to/repo'))
})

it('sets a working directory on root', async() => {
inputs['working-directory'] = '/'
inputs['path'] = 'path/to/repo'
const settings: IGitSourceSettings = await inputHelper.getInputs()
expect(settings.repositoryPath).toBe(path.resolve('/path/to/repo'))
})

it('sets a working directory on root and repository path is set to empty', async() => {
inputs['working-directory'] = '/'
inputs['path'] = ''
const settings: IGitSourceSettings = await inputHelper.getInputs()
expect(settings.repositoryPath).toBe(path.resolve('/'))
})
})
4 changes: 2 additions & 2 deletions src/input-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ export async function getInputs(): Promise<IGitSourceSettings> {
)
if (
!(result.repositoryPath + path.sep).startsWith(
workingDirectory + path.sep
workingDirectory
)
) {
throw new Error(
`Repository path '${result.repositoryPath}' is not under '${workingDirectory}'`
`Repository path '${result.repositoryPath + path.sep}' is not under '${workingDirectory}'`
)
}

Expand Down

0 comments on commit 8461fff

Please sign in to comment.