fix: fixed wrong test for get-npmrc-path

anolilab · May 23, 2024 · 8f86d0f · 8f86d0f
1 parent d09f625
commit 8f86d0f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/packages/semantic-release-pnpm/__tests__/unit/utils/get-npmrc-path.test.ts b/packages/semantic-release-pnpm/__tests__/unit/utils/get-npmrc-path.test.ts
@@ -4,6 +4,7 @@ import type AggregateError from "aggregate-error";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import getNpmrcPath from "../../../src/utils/get-npmrc-path";
+import { join } from "@visulima/path";
 
 const mocks = vi.hoisted(() => {
     return {
@@ -14,8 +15,11 @@ const mocks = vi.hoisted(() => {
     };
 });
 
-vi.mock("@visulima/fs", () => {
+vi.mock("@visulima/fs", async () => {
+    const actual = await vi.importActual("@visulima/fs");
+
     return {
+        ...actual,
         ensureFileSync: mocks.mockedEnsureFileSync,
         isAccessibleSync: mocks.mockedIsAccessibleSync,
     };
@@ -27,8 +31,11 @@ vi.mock("@visulima/package", () => {
     };
 });
 
-vi.mock("@visulima/path", () => {
+vi.mock("@visulima/path", async () => {
+    const actual = await vi.importActual("@visulima/path");
+
     return {
+        ...actual,
         resolve: mocks.mockedResolve,
     };
 });
@@ -73,10 +80,11 @@ describe("getNpmrcPath", () => {
         expect.assertions(3);
 
         const environment = {};
-        const temporaryNpmrcPath = "/temporary/directory/.npmrc";
+        const cachePath = "/temporary/directory";
+        const temporaryNpmrcPath = join(cachePath, ".npmrc");
 
         mocks.mockedIsAccessibleSync.mockReturnValue(false);
-        mocks.mockedFindCacheDirectorySync.mockReturnValue(temporaryNpmrcPath);
+        mocks.mockedFindCacheDirectorySync.mockReturnValue(cachePath);
 
         const result = getNpmrcPath(cwd, environment);
 

diff --git a/packages/semantic-release-pnpm/src/utils/get-npmrc-path.ts b/packages/semantic-release-pnpm/src/utils/get-npmrc-path.ts
@@ -1,6 +1,6 @@
 import { ensureFileSync, isAccessibleSync } from "@visulima/fs";
 import { findCacheDirectorySync } from "@visulima/package";
-import { resolve } from "@visulima/path";
+import { join, resolve } from "@visulima/path";
 
 import getError from "./get-error";
 
@@ -14,9 +14,11 @@ const getNpmrcPath = (cwd: string, environment: NodeJS.ProcessEnv): string => {
     } else if (isAccessibleSync(npmrcPath)) {
         npmrc = npmrcPath;
     } else {
-        const temporaryNpmrcPath = findCacheDirectorySync("semantic-release-pnpm", { create: true, cwd });
+        const cachePath = findCacheDirectorySync("semantic-release-pnpm", { create: true, cwd });
+
+        if (cachePath) {
+            const temporaryNpmrcPath = join(cachePath, ".npmrc");
 
-        if (temporaryNpmrcPath) {
             ensureFileSync(temporaryNpmrcPath);
 
             npmrc = temporaryNpmrcPath;