actions/checkout
1
0
Fork 0
mirror of https://gitea.com/actions/checkout.git synced 2024-11-01 01:20:35 +01:00
Code Issues Projects Releases Wiki Activity

change: remove path.sep, add unit tests, dist

Browse Source 
Remove path.sep during comparison with repositoryPath
(did not take in account root folders)
Updated and added more unit tests
Updated dist/index.js
This commit is contained in:
Marco Accorinti 2023-09-20 21:02:10 +02:00
parent faa95350fe
commit 53a4183dea
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
__test__/git-auth-helper.test.ts
View File

@ -821,7 +821,6 @@ async function setup(testName: string): Promise<void> {
workflowOrganizationId: 123456,
setSafeDirectory: true,
githubServerUrl: githubServerUrl,
workingDirectory: undefined
}
}

21
__test__/input-helper.test.ts
View File

@ -143,4 +143,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('/'))
})
})

6
dist/index.js vendored
View File

@ -1672,7 +1672,7 @@ function getInputs() {
return __awaiter(this, void 0, void 0, function* () {
const result = {};
// Working directory
let workingDirectory = core.getInput('workingDirectory') || process.env['GITHUB_WORKSPACE'];
let workingDirectory = core.getInput('working-directory') || process.env['GITHUB_WORKSPACE'];
if (!workingDirectory) {
throw new Error('working dir not defined');
}
@ -1694,8 +1694,8 @@ function getInputs() {
// Repository path
result.repositoryPath = core.getInput('path') || '.';
result.repositoryPath = path.resolve(workingDirectory, result.repositoryPath);
if (!(result.repositoryPath + path.sep).startsWith(workingDirectory + path.sep)) {
throw new Error(`Repository path '${result.repositoryPath}' is not under '${workingDirectory}'`);
if (!(result.repositoryPath + path.sep).startsWith(workingDirectory)) {
throw new Error(`Repository path '${result.repositoryPath + path.sep}' is not under '${workingDirectory}'`);
}
// Workflow repository?
const isWorkflowRepository = qualifiedRepository.toUpperCase() ===

4
src/input-helper.ts
View File

@ -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}'`
)
}