Skip to content

tests: remove redundant getStdOutput() test utility #2972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iuioiua wants to merge 1 commit into from
Closed

tests: remove redundant getStdOutput() test utility #2972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions init/src/init_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from "@std/expect";
import { initProject, InitStep, type MockTTY } from "./init.ts";
import * as path from "@std/path";
import { getStdOutput, withBrowser } from "../../tests/test_utils.tsx";
import { withBrowser } from "../../tests/test_utils.tsx";
import { waitForText } from "../../tests/test_utils.tsx";
import { withChildProcessServer } from "../../tests/test_utils.tsx";

Expand Down Expand Up @@ -245,9 +245,12 @@ Deno.test("init - errors on missing build cache in prod", async () => {
stdout: "piped",
stderr: "piped",
cwd: dir,
env: {
NO_COLOR: "true",
Copy link
Contributor Author

@iuioiua iuioiua May 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eliminates the need to strip ANSI codes.

},
}).output();

const { stderr } = getStdOutput(cp);
const stderr = new TextDecoder().decode(cp.stderr);
expect(cp.code).toEqual(1);

expect(stderr).toMatch(/Found 1 islands, but did not/);
Expand Down
22 changes: 11 additions & 11 deletions src/dev/update_check_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as path from "@std/path";
import denoJson from "../../deno.json" with { type: "json" };
import { WEEK } from "@std/datetime";
import { getStdOutput } from "../../tests/test_utils.tsx";
import { expect } from "@std/expect";
import type { CheckFile } from "./update_check.ts";

Expand Down Expand Up @@ -59,7 +58,7 @@ Deno.test("skips update check on specific environment variables", async (t) => {
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).not.toMatch(/Fresh 1\.30\.0 is available/);

await Deno.remove(tmpDirName, { recursive: true });
Expand Down Expand Up @@ -91,12 +90,13 @@ Deno.test("shows update message on version mismatch", async () => {
CI: "false",
TEST_HOME: tmpDirName,
LATEST_VERSION: "999.999.0",
NO_COLOR: "true",
},
stderr: "piped",
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).toMatch(/Fresh 999\.999\.0 is available/);

// Updates check file
Expand Down Expand Up @@ -132,7 +132,7 @@ Deno.test("only fetch new version defined by interval", async (t) => {
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).toMatch(/fetching latest version/);
});

Expand All @@ -154,7 +154,7 @@ Deno.test("only fetch new version defined by interval", async (t) => {
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).not.toMatch(/fetching latest version/);
});

Expand All @@ -174,7 +174,7 @@ Deno.test("only fetch new version defined by interval", async (t) => {
},
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).toMatch(/fetching latest version/);
});

Expand Down Expand Up @@ -211,7 +211,7 @@ Deno.test("updates current version in cache file", async () => {
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).not.toMatch(/Fresh .* is available/);

await Deno.remove(tmpDirName, { recursive: true });
Expand Down Expand Up @@ -248,7 +248,7 @@ Deno.test("only shows update message when current < latest", async () => {
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).not.toMatch(/Fresh .* is available/);

await Deno.remove(tmpDirName, { recursive: true });
Expand Down Expand Up @@ -285,7 +285,7 @@ Deno.test("migrates to last_shown property", async () => {
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).toMatch(/Fresh .* is available/);

const checkFileAfter = JSON.parse(
Expand Down Expand Up @@ -335,7 +335,7 @@ Deno.test("doesn't show update if last_shown + interval >= today", async () => {
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).not.toMatch(/Fresh .* is available/);

await Deno.remove(tmpDirName, { recursive: true });
Expand Down Expand Up @@ -378,7 +378,7 @@ Deno.test(
stdout: "piped",
}).output();

const { stdout } = getStdOutput(out);
const stdout = new TextDecoder().decode(out.stdout);
expect(stdout).toMatch(/Fresh .* is available/);

const checkFileAfter = JSON.parse(
Expand Down
12 changes: 0 additions & 12 deletions tests/test_utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,18 +351,6 @@ export async function waitFor(
throw new Error(`Timed out`);
}

export function getStdOutput(
out: Deno.CommandOutput,
): { stdout: string; stderr: string } {
const decoder = new TextDecoder();
const stdout = colors.stripAnsiCode(decoder.decode(out.stdout));

const decoderErr = new TextDecoder();
const stderr = colors.stripAnsiCode(decoderErr.decode(out.stderr));

return { stdout, stderr };
}

export const allIslandApp = new App()
.island(getIsland("Counter.tsx"), "Counter", Counter)
.island(
Expand Down
Loading