aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/cli/install/bun-add.test.ts22
-rw-r--r--test/cli/install/bun-install.test.ts21
2 files changed, 23 insertions, 20 deletions
diff --git a/test/cli/install/bun-add.test.ts b/test/cli/install/bun-add.test.ts
index c00c0ba7b..14ae44f73 100644
--- a/test/cli/install/bun-add.test.ts
+++ b/test/cli/install/bun-add.test.ts
@@ -20,7 +20,11 @@ import {
beforeAll(dummyBeforeAll);
afterAll(dummyAfterAll);
+let port: string;
let add_dir: string;
+beforeAll(() => {
+ port = new URL(root_url).port;
+});
beforeEach(async () => {
add_dir = await mkdtemp(join(await realpath(tmpdir()), "bun-add.test"));
@@ -102,9 +106,9 @@ it("should reject missing package", async () => {
});
expect(stderr).toBeDefined();
const err = await new Response(stderr).text();
- expect(err.includes("bun add")).toBeTrue();
- expect(err.includes("error: MissingPackageJSON")).toBeTrue();
- expect(err.includes(`note: error occured while resolving file:${add_path}`)).toBeTrue();
+ expect(err).toContain("bun add");
+ expect(err).toContain("error: MissingPackageJSON");
+ expect(err).toContain(`note: error occured while resolving file:${add_path}`);
expect(stdout).toBeDefined();
const out = await new Response(stdout).text();
@@ -144,9 +148,9 @@ it("should reject invalid path without segfault", async () => {
});
expect(stderr).toBeDefined();
const err = await new Response(stderr).text();
- expect(err.includes("bun add")).toBeTrue();
- expect(err.includes("error: MissingPackageJSON")).toBeTrue();
- expect(err.includes(`note: error occured while resolving file://${add_path}`)).toBeTrue();
+ expect(err).toContain("bun add");
+ expect(err).toContain("error: MissingPackageJSON");
+ expect(err).toContain(`note: error occured while resolving file://${add_path}`);
expect(stdout).toBeDefined();
const out = await new Response(stdout).text();
@@ -189,7 +193,7 @@ it("should handle semver-like names", async () => {
});
expect(stderr).toBeDefined();
const err = await new Response(stderr).text();
- expect(err.split(/\r?\n/)).toContain('error: package "1.2.3" not found localhost/1.2.3 404');
+ expect(err.split(/\r?\n/)).toContain(`error: package "1.2.3" not found localhost:${port}/1.2.3 404`);
expect(stdout).toBeDefined();
expect(await new Response(stdout).text()).toBe("");
expect(await exited).toBe(1);
@@ -232,7 +236,7 @@ it("should handle @scoped names", async () => {
});
expect(stderr).toBeDefined();
const err = await new Response(stderr).text();
- expect(err.split(/\r?\n/)).toContain('error: package "@bar/baz" not found localhost/@bar%2fbaz 404');
+ expect(err.split(/\r?\n/)).toContain(`error: package "@bar/baz" not found localhost:${port}/@bar%2fbaz 404`);
expect(stdout).toBeDefined();
expect(await new Response(stdout).text()).toBe("");
expect(await exited).toBe(1);
@@ -1512,7 +1516,7 @@ async function installRedirectsToAdd(saveFlagFirst: boolean) {
" 1 packages installed",
]);
expect(await exited).toBe(0);
- expect((await file(join(package_dir, "package.json")).text()).includes("bun-add.test"));
+ expect(await file(join(package_dir, "package.json")).text()).toInclude("bun-add.test");
}
it("should add dependency alongside peerDependencies", async () => {
diff --git a/test/cli/install/bun-install.test.ts b/test/cli/install/bun-install.test.ts
index 25cd0aca7..354909745 100644
--- a/test/cli/install/bun-install.test.ts
+++ b/test/cli/install/bun-install.test.ts
@@ -96,7 +96,7 @@ it("should handle missing package", async () => {
});
expect(stderr).toBeDefined();
const err = await new Response(stderr).text();
- expect(err.split(/\r?\n/)).toContain('error: package "foo" not found localhost/foo 404');
+ expect(err.split(/\r?\n/)).toContain(`error: package "foo" not found localhost:${new URL(root_url).port}/foo 404`);
expect(stdout).toBeDefined();
expect(await new Response(stdout).text()).toBeEmpty();
expect(await exited).toBe(1);
@@ -6022,13 +6022,13 @@ describe("Registry URLs", () => {
["https://registry.npmjs.org/", false],
["https://artifactory.xxx.yyy/artifactory/api/npm/my-npm/", false], // https://github.com/oven-sh/bun/issues/3899
["https://artifactory.xxx.yyy/artifactory/api/npm/my-npm", false], // https://github.com/oven-sh/bun/issues/5368
- ["", true],
+ // ["", true],
["https:example.org", false],
["https://////example.com///", false],
["https://example.com/https:example.org", false],
["https://example.com/[]?[]#[]", false],
["https://example/%?%#%", false],
- ["c:", false],
+ ["c:", true],
["c:/", false],
["https://點看", false], // gets converted to punycode
["https://xn--c1yn36f/", false],
@@ -6067,11 +6067,10 @@ describe("Registry URLs", () => {
const err = await new Response(stderr).text();
if (fails) {
- const url = regURL.at(-1) === "/" ? regURL : regURL + "/";
- expect(err.includes(`Failed to join registry \"${url}\" and package \"notapackage\" URLs`)).toBeTrue();
- expect(err.includes("error: InvalidURL")).toBeTrue();
+ expect(err).toContain(`Failed to join registry "${regURL}" and package "notapackage" URLs`);
+ expect(err).toContain("error: InvalidURL");
} else {
- expect(err.includes("error: notapackage@0.0.2 failed to resolve")).toBeTrue();
+ expect(err).toContain("error: notapackage@0.0.2 failed to resolve");
}
// fails either way, since notapackage is, well, not a real package.
expect(await exited).not.toBe(0);
@@ -6108,8 +6107,8 @@ describe("Registry URLs", () => {
expect(stderr).toBeDefined();
const err = await new Response(stderr).text();
- expect(err.includes(`Failed to join registry \"${regURL}/\" and package \"notapackage\" URLs`)).toBeTrue();
- expect(err.includes("warn: InvalidURL")).toBeTrue();
+ expect(err).toContain(`Failed to join registry "${regURL}" and package "notapackage" URLs`);
+ expect(err).toContain("warn: InvalidURL");
expect(await exited).toBe(0);
});
@@ -6149,8 +6148,8 @@ describe("Registry URLs", () => {
expect(stderr).toBeDefined();
const err = await new Response(stderr).text();
- expect(err.includes(`Failed to join registry \"${regURL}\" and package \"notapackage\" URLs`)).toBeTrue();
- expect(err.includes("warn: InvalidURL")).toBeTrue();
+ expect(err).toContain(`Failed to join registry "${regURL}" and package "notapackage" URLs`);
+ expect(err).toContain("warn: InvalidURL");
expect(await exited).toBe(0);
});
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-09 12:08:35 +0000