diff --git a/__tests__/actionUtils.test.ts b/__tests__/actionUtils.test.ts index f51978a..4fcb8d6 100644 --- a/__tests__/actionUtils.test.ts +++ b/__tests__/actionUtils.test.ts @@ -7,6 +7,7 @@ import { promises as fs } from "fs"; import { Events, Outputs, State } from "../src/constants"; import { ArtifactCacheEntry } from "../src/contracts"; import * as actionUtils from "../src/utils/actionUtils"; +import uuid = require("uuid"); jest.mock("@actions/core"); jest.mock("os"); @@ -224,7 +225,12 @@ test("resolvePaths with no ~ in path", async () => { }); test("resolvePaths with ~ in path", async () => { - const filePath = "~/.cache/yarn"; + // const filePath = "~/.cache/yarn"; + const cacheDir = uuid(); + const filePath = `~/${cacheDir}`; + // Create the following layout: + // ~/uuid + // ~/uuid/file.txt const homedir = jest.requireActual("os").homedir(); const homedirMock = jest.spyOn(os, "homedir"); @@ -232,15 +238,21 @@ test("resolvePaths with ~ in path", async () => { return homedir; }); + const target = path.join(homedir, cacheDir); + await fs.mkdir(target, { recursive: true }); + await fs.writeFile(path.join(target, "file.txt"), "cached"); + const root = getTempDir(); process.env["GITHUB_WORKSPACE"] = root; - const resolvedPath = await actionUtils.resolvePaths([filePath]); + try { + const resolvedPath = await actionUtils.resolvePaths([filePath]); - const expectedPath = [ - path.relative(root, path.join(homedir, ".cache/yarn")) - ]; - expect(resolvedPath).toStrictEqual(expectedPath); + const expectedPath = [path.relative(root, target)]; + expect(resolvedPath).toStrictEqual(expectedPath); + } finally { + await io.rmRF(target); + } }); test("resolvePaths with home not found", async () => { diff --git a/package-lock.json b/package-lock.json index 669979b..98e8202 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2244,8 +2244,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -2266,14 +2265,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2288,20 +2285,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2418,8 +2412,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2431,7 +2424,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2446,7 +2438,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2454,14 +2445,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2480,7 +2469,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2561,8 +2549,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2574,7 +2561,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -2660,8 +2646,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -2697,7 +2682,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2717,7 +2701,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2761,14 +2744,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } },