Fix unit tests

actions · Jun 22, 2023 · 70c9389 · 70c9389
1 parent 1db1d57
commit 70c9389
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/__tests__/cache-restore.test.ts b/__tests__/cache-restore.test.ts
@@ -45,15 +45,13 @@ describe('cache-restore', () => {
     }
   }
 
-  let inputs = {} as any;
   let saveStateSpy: jest.SpyInstance;
   let infoSpy: jest.SpyInstance;
   let debugSpy: jest.SpyInstance;
   let setOutputSpy: jest.SpyInstance;
   let getCommandOutputSpy: jest.SpyInstance;
   let restoreCacheSpy: jest.SpyInstance;
   let hashFilesSpy: jest.SpyInstance;
-  let inSpy: jest.SpyInstance;
 
   beforeEach(() => {
     // core
@@ -69,10 +67,6 @@ describe('cache-restore', () => {
     saveStateSpy = jest.spyOn(core, 'saveState');
     saveStateSpy.mockImplementation(() => undefined);
 
-    inputs = {};
-    inSpy = jest.spyOn(core, 'getInput');
-    inSpy.mockImplementation(name => inputs[name]);
-
     // glob
     hashFilesSpy = jest.spyOn(glob, 'hashFiles');
     hashFilesSpy.mockImplementation((pattern: string) => {
@@ -137,12 +131,11 @@ describe('cache-restore', () => {
             return findCacheFolder(command);
           }
         });
-        inputs['node-version'] = 'vABC';
 
         await restoreCache(packageManager, '');
         expect(hashFilesSpy).toHaveBeenCalled();
         expect(infoSpy).toHaveBeenCalledWith(
-          `Cache restored from key: node-cache-${platform}-${packageManager}-v2-vABC-${fileHash}`
+          `Cache restored from key: node-cache-${platform}-${packageManager}-${fileHash}`
         );
         expect(infoSpy).not.toHaveBeenCalledWith(
           `${packageManager} cache is not found`

diff --git a/__tests__/cache-utils.test.ts b/__tests__/cache-utils.test.ts
@@ -6,7 +6,8 @@ import {
   PackageManagerInfo,
   isCacheFeatureAvailable,
   supportedPackageManagers,
-  getCommandOutput
+  getCommandOutput,
+  resetProjectDirectoriesMemoized
 } from '../src/cache-utils';
 import fs from 'fs';
 import * as cacheUtils from '../src/cache-utils';
@@ -104,9 +105,7 @@ describe('cache-utils', () => {
           MockGlobber.create(['/foo', '/bar'])
       );
 
-      Object.keys(expandedPatternsMemoized).forEach(
-        key => delete expandedPatternsMemoized[key]
-      );
+      resetProjectDirectoriesMemoized();
     });
 
     afterEach(() => {

diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
@@ -60434,7 +60434,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isCacheFeatureAvailable = exports.isGhes = exports.repoHasYarn3ManagedCache = exports.getCacheDirectories = exports.getPackageManagerInfo = exports.getCommandOutputNotEmpty = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
+exports.isCacheFeatureAvailable = exports.isGhes = exports.repoHasYarn3ManagedCache = exports.getCacheDirectories = exports.resetProjectDirectoriesMemoized = exports.getPackageManagerInfo = exports.getCommandOutputNotEmpty = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const exec = __importStar(__nccwpck_require__(1514));
 const cache = __importStar(__nccwpck_require__(7799));
@@ -60511,6 +60511,11 @@ exports.getPackageManagerInfo = getPackageManagerInfo;
  *  it contains expensive IO operation and thus should be memoized
  */
 let projectDirectoriesMemoized = null;
+/**
+ * unit test must reset memoized variables
+ */
+const resetProjectDirectoriesMemoized = () => (projectDirectoriesMemoized = null);
+exports.resetProjectDirectoriesMemoized = resetProjectDirectoriesMemoized;
 /**
  * Expands (converts) the string input `cache-dependency-path` to list of directories that
  * may be project roots

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -71220,7 +71220,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isCacheFeatureAvailable = exports.isGhes = exports.repoHasYarn3ManagedCache = exports.getCacheDirectories = exports.getPackageManagerInfo = exports.getCommandOutputNotEmpty = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
+exports.isCacheFeatureAvailable = exports.isGhes = exports.repoHasYarn3ManagedCache = exports.getCacheDirectories = exports.resetProjectDirectoriesMemoized = exports.getPackageManagerInfo = exports.getCommandOutputNotEmpty = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const exec = __importStar(__nccwpck_require__(1514));
 const cache = __importStar(__nccwpck_require__(7799));
@@ -71297,6 +71297,11 @@ exports.getPackageManagerInfo = getPackageManagerInfo;
  *  it contains expensive IO operation and thus should be memoized
  */
 let projectDirectoriesMemoized = null;
+/**
+ * unit test must reset memoized variables
+ */
+const resetProjectDirectoriesMemoized = () => (projectDirectoriesMemoized = null);
+exports.resetProjectDirectoriesMemoized = resetProjectDirectoriesMemoized;
 /**
  * Expands (converts) the string input `cache-dependency-path` to list of directories that
  * may be project roots

diff --git a/src/cache-utils.ts b/src/cache-utils.ts
@@ -119,6 +119,11 @@ export const getPackageManagerInfo = async (packageManager: string) => {
  */
 
 let projectDirectoriesMemoized: string[] | null = null;
+/**
+ * unit test must reset memoized variables
+ */
+export const resetProjectDirectoriesMemoized = () =>
+  (projectDirectoriesMemoized = null);
 /**
  * Expands (converts) the string input `cache-dependency-path` to list of directories that
  * may be project roots