actions/setup-node
1
0
Fork 0
mirror of https://github.com/actions/setup-node.git synced 2025-06-29 14:13:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Apply fixes

Browse source
This commit is contained in:
Sergey Dolin 2023-05-30 14:15:01 +02:00
parent 7406bf5e76
commit 9ddc512bc1
8 changed files with 193 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

8
__tests__/cache-restore.test.ts
View file

@ -32,13 +32,13 @@ describe('cache-restore', () => {
function findCacheFolder(command: string) {
switch (command) {
case utils.npmGetCacheFolderCommand:
case 'npm config get cache':
return npmCachePath;
case utils.pnpmGetCacheFolderCommand:
case 'pnpm store path --silent':
return pnpmCachePath;
case utils.yarn1GetCacheFolderCommand:
case 'yarn cache dir':
return yarn1CachePath;
case utils.yarn2GetCacheFolderCommand:
case 'yarn config get cacheFolder':
return yarn2CachePath;
default:
return 'packge/not/found';

28
__tests__/cache-save.test.ts
View file

@ -118,13 +118,10 @@ describe('run', () => {
expect(getStateSpy).toHaveBeenCalledTimes(2);
expect(getCommandOutputSpy).toHaveBeenCalledTimes(2);
expect(debugSpy).toHaveBeenCalledWith(
'Project directory "." derived from cache-dependency-path: ""'
'Consumed yarn version is 1.2.3 (working dir: "")'
);
expect(debugSpy).toHaveBeenCalledWith(
'Consumed yarn version is 1.2.3 (working dir: ".")'
);
expect(debugSpy).toHaveBeenCalledWith(
'yarn\'s cache folder "/some/random/path/yarn1" configured for the directory "."'
'yarn\'s cache folder "/some/random/path/yarn1" configured for the root directory'
);
expect(infoSpy).toHaveBeenCalledWith(
`Cache hit occurred on the primary key ${yarnFileHash}, not saving cache.`
@ -145,13 +142,10 @@ describe('run', () => {
expect(getStateSpy).toHaveBeenCalledTimes(2);
expect(getCommandOutputSpy).toHaveBeenCalledTimes(2);
expect(debugSpy).toHaveBeenCalledWith(
'Project directory "." derived from cache-dependency-path: ""'
'Consumed yarn version is 2.2.3 (working dir: "")'
);
expect(debugSpy).toHaveBeenCalledWith(
'Consumed yarn version is 2.2.3 (working dir: ".")'
);
expect(debugSpy).toHaveBeenCalledWith(
'yarn\'s cache folder "/some/random/path/yarn2" configured for the directory "."'
'yarn\'s cache folder "/some/random/path/yarn2" configured for the root directory'
);
expect(infoSpy).toHaveBeenCalledWith(
`Cache hit occurred on the primary key ${yarnFileHash}, not saving cache.`
@ -218,13 +212,10 @@ describe('run', () => {
expect(getStateSpy).toHaveBeenCalledTimes(2);
expect(getCommandOutputSpy).toHaveBeenCalledTimes(2);
expect(debugSpy).toHaveBeenCalledWith(
'Project directory "." derived from cache-dependency-path: ""'
'Consumed yarn version is 1.2.3 (working dir: "")'
);
expect(debugSpy).toHaveBeenCalledWith(
'Consumed yarn version is 1.2.3 (working dir: ".")'
);
expect(debugSpy).toHaveBeenCalledWith(
'yarn\'s cache folder "/some/random/path/yarn1" configured for the directory "."'
'yarn\'s cache folder "/some/random/path/yarn1" configured for the root directory'
);
expect(infoSpy).not.toHaveBeenCalledWith(
`Cache hit occurred on the primary key ${yarnFileHash}, not saving cache.`
@ -255,13 +246,10 @@ describe('run', () => {
expect(getStateSpy).toHaveBeenCalledTimes(2);
expect(getCommandOutputSpy).toHaveBeenCalledTimes(2);
expect(debugSpy).toHaveBeenCalledWith(
'Project directory "." derived from cache-dependency-path: ""'
'Consumed yarn version is 2.2.3 (working dir: "")'
);
expect(debugSpy).toHaveBeenCalledWith(
'Consumed yarn version is 2.2.3 (working dir: ".")'
);
expect(debugSpy).toHaveBeenCalledWith(
'yarn\'s cache folder "/some/random/path/yarn2" configured for the directory "."'
'yarn\'s cache folder "/some/random/path/yarn2" configured for the root directory'
);
expect(infoSpy).not.toHaveBeenCalledWith(
`Cache hit occurred on the primary key ${yarnFileHash}, not saving cache.`

76
__tests__/cache-utils.test.ts
View file

@ -7,8 +7,7 @@ import {
isCacheFeatureAvailable,
supportedPackageManagers,
getCommandOutput,
expandCacheDependencyPath,
expandedPatternsMemoized
memoizedCacheDependencies
} from '../src/cache-utils';
import fs from 'fs';
import * as cacheUtils from '../src/cache-utils';
@ -106,8 +105,8 @@ describe('cache-utils', () => {
MockGlobber.create(['/foo', '/bar'])
);
Object.keys(expandedPatternsMemoized).forEach(
key => delete expandedPatternsMemoized[key]
Object.keys(memoizedCacheDependencies).forEach(
key => delete memoizedCacheDependencies[key]
);
});
@ -117,44 +116,6 @@ describe('cache-utils', () => {
globCreateSpy.mockRestore();
});
it('expandCacheDependencyPath should handle one line', async () => {
expect(await expandCacheDependencyPath('one')).toEqual(['one']);
});
it('expandCacheDependencyPath should handle one line glob', async () => {
globCreateSpy.mockImplementation(
(pattern: string): Promise<Globber> =>
MockGlobber.create(['one', 'two'])
);
expect(await expandCacheDependencyPath('**')).toEqual(['one', 'two']);
});
it('expandCacheDependencyPath should handle multiple lines', async () => {
const lines = `
one
two
`;
expect(await expandCacheDependencyPath(lines)).toEqual(['one', 'two']);
});
it('expandCacheDependencyPath should handle multiple globs', async () => {
const lines = `
one
**
`;
globCreateSpy.mockImplementation(
(pattern: string): Promise<Globber> =>
MockGlobber.create(['two', 'three'])
);
expect(await expandCacheDependencyPath(lines)).toEqual([
'one',
'two',
'three'
]);
});
it.each([
[supportedPackageManagers.npm, ''],
[supportedPackageManagers.npm, '/dir/file.lock'],
@ -167,7 +128,7 @@ two
async (packageManagerInfo, cacheDependency) => {
getCommandOutputSpy.mockImplementation(() => 'foo');
const dirs = await cacheUtils.getCacheDirectoriesPaths(
const dirs = await cacheUtils.getCacheDirectories(
packageManagerInfo,
cacheDependency
);
@ -181,7 +142,7 @@ two
it('getCacheDirectoriesPaths should return one dir for yarn without cacheDependency', async () => {
getCommandOutputSpy.mockImplementation(() => 'foo');
const dirs = await cacheUtils.getCacheDirectoriesPaths(
const dirs = await cacheUtils.getCacheDirectories(
supportedPackageManagers.yarn,
''
);
@ -208,10 +169,7 @@ two
);
await expect(
cacheUtils.getCacheDirectoriesPaths(
packageManagerInfo,
cacheDependency
)
cacheUtils.getCacheDirectories(packageManagerInfo, cacheDependency)
).rejects.toThrow(); //'Could not get cache folder path for /dir');
}
);
@ -234,10 +192,7 @@ two
}));
await expect(
cacheUtils.getCacheDirectoriesPaths(
packageManagerInfo,
cacheDependency
)
cacheUtils.getCacheDirectories(packageManagerInfo, cacheDependency)
).rejects.toThrow(); //'Could not get cache folder path for /dir');
}
);
@ -248,7 +203,7 @@ two
getCommandOutputSpy.mockImplementationOnce(() => version);
getCommandOutputSpy.mockImplementationOnce(() => `foo${version}`);
const dirs = await cacheUtils.getCacheDirectoriesPaths(
const dirs = await cacheUtils.getCacheDirectories(
supportedPackageManagers.yarn,
''
);
@ -268,7 +223,7 @@ two
MockGlobber.create(['/tmp/dir1/file', '/tmp/dir2/file'])
);
const dirs = await cacheUtils.getCacheDirectoriesPaths(
const dirs = await cacheUtils.getCacheDirectories(
supportedPackageManagers.yarn,
'/tmp/**/file'
);
@ -292,7 +247,7 @@ two
])
);
const dirs = await cacheUtils.getCacheDirectoriesPaths(
const dirs = await cacheUtils.getCacheDirectories(
supportedPackageManagers.yarn,
'/tmp/**/file'
);
@ -318,7 +273,7 @@ two
])
);
const dirs = await cacheUtils.getCacheDirectoriesPaths(
const dirs = await cacheUtils.getCacheDirectories(
supportedPackageManagers.yarn,
'/tmp/**/file'
);
@ -367,13 +322,18 @@ two
`;
globCreateSpy.mockImplementation(
(pattern: string): Promise<Globber> =>
MockGlobber.create(['/tmp/dir3/file', '/tmp/dir4/file'])
MockGlobber.create([
'/tmp/dir1/file',
'/tmp/dir2/file',
'/tmp/dir3/file',
'/tmp/dir4/file'
])
);
let dirNo = 1;
getCommandOutputSpy.mockImplementation((command: string) =>
command.includes('version') ? version : `file_${version}_${dirNo++}`
);
const dirs = await cacheUtils.getCacheDirectoriesPaths(
const dirs = await cacheUtils.getCacheDirectories(
supportedPackageManagers.yarn,
cacheDependencyPath
);