mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix snapshot regression (#14031)

Browse Source
This commit is contained in:
Dylan Conway
2024-09-19 13:27:42 -07:00
committed by GitHub
parent 6415296e96
commit 47e4b826fa
3 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/bun.js/test/snapshot.zig
View File

@@ -140,48 +140,32 @@ pub const Snapshots = struct {
// TODO: when common js transform changes, keep this updated or add flag to support this version
const export_default = brk: {
for (ast.parts.slice()) |part| {
for (part.stmts) |stmt| {
if (stmt.data == .s_export_default and stmt.data.s_export_default.value == .expr) {
break :brk stmt.data.s_export_default.value.expr;
}
}
}
return;
};
if (export_default.data == .e_call) {
const function_call = export_default.data.e_call;
if (function_call.args.len == 2 and function_call.args.ptr[0].data == .e_function) {
const arg_function_stmts = function_call.args.ptr[0].data.e_function.func.body.stmts;
for (arg_function_stmts) |stmt| {
switch (stmt.data) {
.s_expr => |expr| {
if (expr.value.data == .e_binary and expr.value.data.e_binary.op == .bin_assign) {
const left = expr.value.data.e_binary.left;
if (left.data == .e_index and left.data.e_index.index.data == .e_string and left.data.e_index.target.data == .e_identifier) {
const target: js_ast.E.Identifier = left.data.e_index.target.data.e_identifier;
var index: *js_ast.E.String = left.data.e_index.index.data.e_string;
if (target.ref.eql(exports_ref) and expr.value.data.e_binary.right.data == .e_string) {
const key = index.slice(this.allocator);
var value_string = expr.value.data.e_binary.right.data.e_string;
const value = value_string.slice(this.allocator);
defer {
if (!index.isUTF8()) this.allocator.free(key);
if (!value_string.isUTF8()) this.allocator.free(value);
}
const value_clone = try this.allocator.alloc(u8, value.len);
bun.copy(u8, value_clone, value);
const name_hash = bun.hash(key);
try this.values.put(name_hash, value_clone);
for (ast.parts.slice()) |part| {
for (part.stmts) |stmt| {
switch (stmt.data) {
.s_expr => |expr| {
if (expr.value.data == .e_binary and expr.value.data.e_binary.op == .bin_assign) {
const left = expr.value.data.e_binary.left;
if (left.data == .e_index and left.data.e_index.index.data == .e_string and left.data.e_index.target.data == .e_identifier) {
const target: js_ast.E.Identifier = left.data.e_index.target.data.e_identifier;
var index: *js_ast.E.String = left.data.e_index.index.data.e_string;
if (target.ref.eql(exports_ref) and expr.value.data.e_binary.right.data == .e_string) {
const key = index.slice(this.allocator);
var value_string = expr.value.data.e_binary.right.data.e_string;
const value = value_string.slice(this.allocator);
defer {
if (!index.isUTF8()) this.allocator.free(key);
if (!value_string.isUTF8()) this.allocator.free(value);
}
const value_clone = try this.allocator.alloc(u8, value.len);
bun.copy(u8, value_clone, value);
const name_hash = bun.hash(key);
try this.values.put(name_hash, value_clone);
}
}
},
else => {},
}
}
},
else => {},
}
}
}

2
test/cli/test/__snapshots__/coverage.test.ts.snap
View File

@@ -15,7 +15,7 @@ TN:
SF:demo2.ts
FNF:2
FNH:1
DA:2,26
DA:2,28
DA:4,10
DA:6,10
DA:9,0

42
test/regression/issue/14029.test.ts Normal file
View File

@@ -0,0 +1,42 @@
import { test, expect } from "bun:test";
import { join } from "path";
import { tmpdirSync, bunExe, bunEnv } from "harness";
test("snapshots will recognize existing entries", async () => {
const testDir = tmpdirSync();
await Bun.write(
join(testDir, "test.test.js"),
`
test("snapshot test", () => {
expect("foo").toMatchSnapshot();
});
`,
);
let proc = Bun.spawnSync({
cmd: [bunExe(), "test", "./test.test.js"],
cwd: testDir,
env: bunEnv,
stdout: "pipe",
stderr: "pipe",
});
expect(proc.stderr.toString()).toContain("1 added");
expect(proc.exitCode).toBe(0);
const newSnapshot = await Bun.file(join(testDir, "__snapshots__", "test.test.js.snap")).text();
// Run the same test, make sure another entry isn't added
proc = Bun.spawnSync({
cmd: [bunExe(), "test", "./test.test.js"],
cwd: testDir,
env: bunEnv,
stdout: "pipe",
stderr: "pipe",
});
expect(proc.stderr.toString()).not.toContain("1 added");
expect(proc.exitCode).toBe(0);
expect(newSnapshot).toBe(await Bun.file(join(testDir, "__snapshots__", "test.test.js.snap")).text());
});