test: stop path and platform tests depending on the host OS (#9564)

Julius Marminge committed 2 months ago

Commit cc607531 parent bfef97310 files · +65 −33Browse files

Unified · Split

10 files

apps/desktop/src/app/DesktopAppIdentity.test.ts +2 −0
apps/desktop/src/app/DesktopAssets.test.ts +7 −1
apps/desktop/src/app/DesktopEnvironment.test.ts +6 −1
apps/server/src/auth/ServerSecretStore.test.ts +2 −2
apps/server/src/project/ProjectFaviconResolver.test.ts +3 −2
apps/server/src/provider/Drivers/ClaudeSkills.test.ts +13 −7
packages/ssh/src/config.test.ts +2 −1
packages/tailscale/src/tailscale.test.ts +14 −12
scripts/mobile-showcase.test.ts +14 −6
scripts/mobile-showcase.ts +2 −1

apps/desktop/src/app/DesktopAppIdentity.test.ts+2−0

+import * as NodePath from "@effect/platform-node/NodePath";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
     Layer.provide(
       Layer.mergeAll(
         NodeServices.layer,
+        NodePath.layerPosix,
         DesktopConfig.layerTest({
           ...env,
         }),

apps/desktop/src/app/DesktopAssets.test.ts+7−1

+import * as NodePath from "@effect/platform-node/NodePath";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
   isPackaged: true,
   resourcesPath: "/Applications/T3 Code.app/Contents/Resources",
   runningUnderArm64Translation: false,
-}).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, DesktopConfig.layerTest({}))));
+}).pipe(
+  Layer.provide(
+    Layer.mergeAll(NodeServices.layer, NodePath.layerPosix, DesktopConfig.layerTest({})),
+  ),
+);
 describe("DesktopAssets", () => {
   it.effect("uses canonical source-tree icons for unpackaged development", () =>
         Layer.provide(
           Layer.mergeAll(
             NodeServices.layer,
+            NodePath.layerPosix,
             DesktopConfig.layerTest({ VITE_DEV_SERVER_URL: "http://localhost:5733" }),
           ),
         ),

apps/desktop/src/app/DesktopEnvironment.test.ts+6−1

+import * as NodePath from "@effect/platform-node/NodePath";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
   DesktopEnvironment.layer({
     ...defaultInput,
     ...overrides,
-  }).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, DesktopConfig.layerTest(env))));
+  }).pipe(
+    Layer.provide(
+      Layer.mergeAll(NodeServices.layer, NodePath.layerPosix, DesktopConfig.layerTest(env)),
+    ),
+  );
 const makeEnvironment = (
   overrides: Partial<DesktopEnvironment.MakeDesktopEnvironmentInput> = {},

apps/server/src/auth/ServerSecretStore.test.ts+2−2

@@ -109,7 +109,7 @@ const ConcurrentReadMissFileSystemLayer = Layer.effect( · 108 unmodified lines
109	return {	109	return {
110	...fileSystem,	110	...fileSystem,
111	readFile: (path) =>	111	readFile: (path) =>
112	String(path).endsWith("/session-signing-key.bin")	112	/[\\/]session-signing-key\.bin$/.test(String(path))
113	? Ref.updateAndGet(readCountRef, (count) => count + 1).pipe(	113	? Ref.updateAndGet(readCountRef, (count) => count + 1).pipe(
114	Effect.flatMap((count) => {	114	Effect.flatMap((count) => {
115	if (count > 2) {	115	if (count > 2) {
@@ -219,7 +219,7 @@ it.layer(NodeServices.layer)("ServerSecretStore.layer", (it) => { · 103 unmodified lines
219	yield* secretStore.set("session-signing-key", Uint8Array.from([1, 2, 3]));	219	yield* secretStore.set("session-signing-key", Uint8Array.from([1, 2, 3]));
220		220
221	assert.isTrue(	221	assert.isTrue(
222	chmodCalls.some((call) => call.mode === 0o700 && call.path.endsWith("/secrets")),	222	chmodCalls.some((call) => call.mode === 0o700 && /[\\/]secrets$/.test(call.path)),
223	);	223	);
224	assert.isAtLeast(chmodCalls.filter((call) => call.mode === 0o600).length, 2);	224	assert.isAtLeast(chmodCalls.filter((call) => call.mode === 0o600).length, 2);
225	}).pipe(Effect.provide(NodeServices.layer)),	225	}).pipe(Effect.provide(NodeServices.layer)),

apps/server/src/project/ProjectFaviconResolver.test.ts+3−2

     it.effect("serves repeated resolves from cache instead of re-walking candidates", () =>
       Effect.gen(function* () {
         const resolver = yield* ProjectFaviconResolver.ProjectFaviconResolver;
+        const path = yield* Path.Path;
         const cwd = yield* makeTempDir;
         yield* writeTextFile(cwd, "public/favicon.svg", "<svg>public</svg>");
         const resolved = yield* resolver.resolvePath(cwd);
-        expect(resolved?.endsWith("public/favicon.svg")).toBe(true);
+        expect(resolved?.endsWith(path.join("public", "favicon.svg"))).toBe(true);
         // `favicon.svg` outranks `public/favicon.svg`, so a resolver that walked
         // the candidate list again would switch to it. Staying on the original
         yield* TestClock.adjust(Duration.minutes(11));
-        expect((yield* resolver.resolvePath(cwd))?.endsWith("/favicon.svg")).toBe(true);
+        expect(yield* resolver.resolvePath(cwd)).toBe(path.join(cwd, "favicon.svg"));
         expect(yield* resolver.resolvePath(cwd)).not.toBe(resolved);
       }).pipe(Effect.provide(TestClock.layer())),
     );

apps/server/src/provider/Drivers/ClaudeSkills.test.ts+13−7

+import * as NodePath from "@effect/platform-node/NodePath";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
   it.effect("lets the administrator's managed policy outrank every other settings file", () =>
     Effect.gen(function* () {
-      const path = yield* Path.Path;
+      // The function is pure on its `path` argument, so hand it the
+      // implementation matching each platform under test rather than the
+      // host's.
+      const path = yield* Path.Path.pipe(Effect.provide(NodePath.layerPosix));
+      const win32Path = yield* Path.Path.pipe(Effect.provide(NodePath.layerWin32));
       for (const [platform, expected] of [
         ["darwin", "/Library/Application Support/ClaudeCode/managed-settings.json"],
       }
       assert.deepEqual(
-        skillOverrideSettingsPaths(path, "/home/.claude", undefined, "win32", {
+        skillOverrideSettingsPaths(win32Path, "C:\\Users\\me\\.claude", undefined, "win32", {
-          PROGRAMDATA: "C:/ProgramData",
+          PROGRAMDATA: "C:\\ProgramData",
         }).at(-1),
-        "C:/ProgramData/ClaudeCode/managed-settings.json",
+        "C:\\ProgramData\\ClaudeCode\\managed-settings.json",
+      );
+      assert.deepEqual(
+        skillOverrideSettingsPaths(win32Path, "C:\\Users\\me\\.claude", undefined, "win32", {}),
+        ["C:\\Users\\me\\.claude\\settings.json"],
       );
-      assert.deepEqual(skillOverrideSettingsPaths(path, "/home/.claude", undefined, "win32", {}), [
-        "/home/.claude/settings.json",
-      ]);
       // Only the repository root's local file joins in, after the
       // workspace's own local file so it wins.

packages/ssh/src/config.test.ts+2−1

+import * as NodePath from "@effect/platform-node/NodePath";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
         "/tmp/home",
       );
       assert.equal(pattern, "/tmp/home/.ssh/config.d/*.conf");
-    }).pipe(Effect.provide(NodeServices.layer)),
+    }).pipe(Effect.provide(NodePath.layerPosix)),
   );
 });

packages/tailscale/src/tailscale.test.ts+14−12

 import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
 import { ChildProcessSpawner } from "effect/unstable/process";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import {
   buildTailscaleHttpsBaseUrl,
   });
 }
+// The executable name depends on the host platform (`tailscale.exe` on
+// Windows), so pin it: these tests assert the posix spelling.
+function spawnerLayer(spawner: ChildProcessSpawner.ChildProcessSpawner["Service"]) {
+  return Layer.merge(
+    Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
+    Layer.succeed(HostProcessPlatform, "linux"),
+  );
+}
 function mockSpawnerLayer(
   handler: (
     command: string,
     args: ReadonlyArray<string>,
   ) => { stdout?: string; stderr?: string; code?: number },
 ) {
-  return Layer.succeed(
+  return spawnerLayer(
-    ChildProcessSpawner.ChildProcessSpawner,
     ChildProcessSpawner.make((command) => {
       const childProcess = command as unknown as {
         readonly command: string;
       method: "spawn",
       cause: systemCause,
     });
-    const layer = Layer.succeed(
+    const layer = spawnerLayer(ChildProcessSpawner.make(() => Effect.fail(cause)));
-      ChildProcessSpawner.ChildProcessSpawner,
-      ChildProcessSpawner.make(() => Effect.fail(cause)),
-    );
     return Effect.gen(function* () {
       const error = yield* readTailscaleStatus.pipe(Effect.flip, Effect.provide(layer));
     // inside an `Effect.callback` registration, so that throw arrives as a
     // defect rather than a typed error - the shape reproduced here.
     const defect = Object.assign(new Error("spawn tailscale ENOTDIR"), { code: "ENOTDIR" });
-    const layer = Layer.succeed(
+    const layer = spawnerLayer(
-      ChildProcessSpawner.ChildProcessSpawner,
       ChildProcessSpawner.make(() =>
         Effect.callback<never, never>(() => {
           throw defect;
   it.effect("times out tailscale status through TestClock", () => {
     const layer = Layer.merge(
       TestClock.layer(),
-      Layer.succeed(
+      spawnerLayer(ChildProcessSpawner.make(() => Effect.succeed(neverFinishingMockHandle()))),
-        ChildProcessSpawner.ChildProcessSpawner,
-        ChildProcessSpawner.make(() => Effect.succeed(neverFinishingMockHandle())),
-      ),
     );
     return Effect.gen(function* () {

scripts/mobile-showcase.test.ts+14−6

+// @effect-diagnostics nodeBuiltinImport:off - expectations mirror the host path joins the script under test performs.
+import * as NodePath from "node:path";
 import { assert, it } from "@effect/vitest";
 import { PNG } from "pngjs";
       directory: showcaseCaptureDirectory("/captures", capture),
     })),
     [
-      { appearance: "light", directory: "/captures/apple/iphone-test/light/t3-code" },
+      {
-      { appearance: "dark", directory: "/captures/apple/iphone-test/dark/t3-code" },
+        appearance: "light",
+        directory: NodePath.join("/captures", "apple", "iphone-test", "light", "t3-code"),
+      },
+      {
+        appearance: "dark",
+        directory: NodePath.join("/captures", "apple", "iphone-test", "dark", "t3-code"),
+      },
     ],
   );
 });
       showcaseCaptureDirectory("/captures", capture),
     ),
     [
-      "/captures/apple/iphone-test/light/ocean",
+      NodePath.join("/captures", "apple", "iphone-test", "light", "ocean"),
-      "/captures/apple/iphone-test/light/ember",
+      NodePath.join("/captures", "apple", "iphone-test", "light", "ember"),
-      "/captures/apple/iphone-test/dark/ocean",
+      NodePath.join("/captures", "apple", "iphone-test", "dark", "ocean"),
-      "/captures/apple/iphone-test/dark/ember",
+      NodePath.join("/captures", "apple", "iphone-test", "dark", "ember"),
     ],
   );
 });

scripts/mobile-showcase.ts+2−1

@@ -53,7 +53,8 @@ export function resolveAndroidSdkRoot( · 52 unmodified lines
53	const configured = environment.ANDROID_HOME ?? environment.ANDROID_SDK_ROOT;	53	const configured = environment.ANDROID_HOME ?? environment.ANDROID_SDK_ROOT;
54	if (configured) return configured;	54	if (configured) return configured;
55	const home = environment.HOME ?? environment.USERPROFILE ?? "";	55	const home = environment.HOME ?? environment.USERPROFILE ?? "";
56	return NodePath.join(home, platform === "darwin" ? "Library/Android/sdk" : "Android/Sdk");	56	const path = platform === "win32" ? NodePath.win32 : NodePath.posix;
		57	return path.join(home, platform === "darwin" ? "Library/Android/sdk" : "Android/Sdk");
57	}	58	}
58		59
59	const ANDROID_SDK_ROOT = resolveAndroidSdkRoot(NodeProcess.env);	60	const ANDROID_SDK_ROOT = resolveAndroidSdkRoot(NodeProcess.env);