Skip to content
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

Jump to bottom

fix(expect): value-equal complex keys in expect.equal() #5936

Merged
merged 1 commit into from
Sep 11, 2024
Merged

fix(expect): value-equal complex keys in expect.equal() #5936

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 expect/_equal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,12 @@ export function equal(c: unknown, d: unknown, options?: EqualOptions): boolean {
for (const [bKey, bValue] of b.entries()) {
/* Given that Map keys can be references, we need
* to ensure that they are also deeply equal */

if (!compare(aKey, bKey)) continue;

if (
(aKey === aValue && bKey === bValue && compare(aKey, bKey)) ||
(compare(aKey, bKey) && compare(aValue, bValue))
(aKey === aValue && bKey === bValue) ||
(compare(aValue, bValue))
) {
unmatchedEntries--;
break;
Expand Down
40 changes: 40 additions & 0 deletions expect/_equal_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,3 +290,43 @@ Deno.test("equal() fast path for primitive keyed collections", () => {
const map6 = new Map(arr.with(-1, -1).map((v, i) => [i, v]));
assertFalse(equal(map5, map6));
});

Deno.test("equal() keyed collection edge cases", () => {
assert(equal(new Set([{ b: 2 }, { a: 1 }]), new Set([{ a: 1 }, { b: 2 }])));
assertFalse(
equal(new Set([{ b: 2 }, { a: 1 }]), new Set([{ a: 1 }, { b: 3 }])),
);

const sym = Symbol();
assert(equal(new Set([sym]), new Set([sym])));
assert(equal(new Set([sym, "a"]), new Set(["a", sym])));
assertFalse(equal(new Set([sym, "a"]), new Set(["b", sym])));
assertFalse(equal(new Set([Symbol()]), new Set([Symbol()])));
assert(equal(new Set([Symbol.for("x")]), new Set([Symbol.for("x")])));

assert(equal(
new Map([[{ b: 2 }, 2], [{ a: 1 }, 1]]),
new Map([[{ a: 1 }, 1], [{ b: 2 }, 2]]),
));
assertFalse(equal(
new Map([[{ b: 2 }, 2], [{ a: 1 }, 1]]),
new Map([[{ a: 1 }, 1], [{ b: 2 }, 3]]),
));
assertFalse(equal(
new Map([[{ b: 2 }, 2], [{ a: 1 }, 1]]),
new Map([[{ a: 1 }, 1], [{ b: 3 }, 2]]),
));

assert(equal(
new Map([[2, { b: 2 }], [1, { a: 1 }]]),
new Map([[1, { a: 1 }], [2, { b: 2 }]]),
));
assertFalse(equal(
new Map([[2, { b: 2 }], [1, { a: 1 }]]),
new Map([[1, { a: 1 }], [3, { b: 2 }]]),
));
assertFalse(equal(
new Map([[2, { b: 2 }], [1, { a: 1 }]]),
new Map([[1, { a: 1 }], [2, { b: 3 }]]),
));
});