fix: tests

Author: DanielleMaywood

devcontainers-cli/main.test.ts

@@ -40,7 +40,21 @@ const executeScriptInContainerWithPackageManager = async (
     ]);
   }
 
-  const resp = await execContainer(id, [shell, "-c", instance.script]);
+  const pathResp = await execContainer(id, [shell, "-c", "echo $PATH"]);
+  const path = pathResp.stdout.trim();
+
+  console.log(path);
+
+  const resp = await execContainer(
+    id,
+    [shell, "-c", instance.script],
+    [
+      "--env",
+      "CODER_SCRIPT_BIN_DIR=/tmp/coder-script-data/bin",
+      "--env",
+      `PATH=${path}:/tmp/coder-script-data/bin`,
+    ],
+  );
   const stdout = resp.stdout.trim().split("\n");
   const stderr = resp.stderr.trim().split("\n");
   return {
@@ -98,13 +112,14 @@ describe("devcontainers-cli", async () => {
       "docker:dind",
       "yarn",
     );
+    console.log(output);
     expect(output.exitCode).toBe(0);
 
     expect(output.stdout[0]).toEqual(
       "Installing @devcontainers/cli using yarn...",
     );
     expect(output.stdout[output.stdout.length - 1]).toEqual(
-      "🥳 @devcontainers/cli has been installed into /usr/local/bin/devcontainer!",
+      "🥳 @devcontainers/cli has been installed into /tmp/coder-script-data/bin/devcontainer!",
     );
   }, 15000);
 

test.ts

@@ -66,12 +66,13 @@ export const executeScriptInContainer = async (
 export const execContainer = async (
   id: string,
   cmd: string[],
+  args?: string[],
 ): Promise<{
   exitCode: number;
   stderr: string;
   stdout: string;
 }> => {
-  const proc = spawn(["docker", "exec", id, ...cmd], {
+	const proc = spawn(["docker", "exec", ...(args ?? []), id, ...cmd], {
     stderr: "pipe",
     stdout: "pipe",
   });