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.

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

fix(@jest/expect-utils): exclude non-enumerable symbol in object matching #14670

Merged
merged 2 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- `[jest-circus, jest-expect, jest-snapshot]` Pass `test.failing` tests when containing failing snapshot matchers ([#14313](https://github.com/jestjs/jest/pull/14313))
- `[jest-config]` Make sure to respect `runInBand` option ([#14578](https://github.com/facebook/jest/pull/14578))
- `[@jest/expect-utils]` Fix comparison of `DataView` ([#14408](https://github.com/jestjs/jest/pull/14408))
- `[@jest/expect-utils]` [**BREAKING**] exclude non-enumerable in object matching ([#14670](https://github.com/jestjs/jest/pull/14670))
- `[jest-leak-detector]` Make leak-detector more aggressive when running GC ([#14526](https://github.com/jestjs/jest/pull/14526))
- `[jest-runtime]` Properly handle re-exported native modules in ESM via CJS ([#14589](https://github.com/jestjs/jest/pull/14589))
- `[jest-util]` Make sure `isInteractive` works in a browser ([#14552](https://github.com/jestjs/jest/pull/14552))
Expand Down
45 changes: 45 additions & 0 deletions packages/expect-utils/src/__tests__/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,51 @@ describe('subsetEquality()', () => {
).toBe(false);
});
});

describe('matching subsets with symbols', () => {
describe('same symbol', () => {
test('objects to not match with value diff', () => {
const symbol = Symbol('foo');
expect(subsetEquality({[symbol]: 1}, {[symbol]: 2})).toBe(false);
});

test('objects to match with non-enumerable symbols', () => {
const symbol = Symbol('foo');
const foo = {};
Object.defineProperty(foo, symbol, {
enumerable: false,
value: 1,
});
const bar = {};
Object.defineProperty(bar, symbol, {
enumerable: false,
value: 2,
});
expect(subsetEquality(foo, bar)).toBe(true);
});
});

describe('different symbol', () => {
test('objects to not match with same value', () => {
expect(subsetEquality({[Symbol('foo')]: 1}, {[Symbol('foo')]: 2})).toBe(
false,
);
});
test('objects to match with non-enumerable symbols', () => {
const foo = {};
Object.defineProperty(foo, Symbol('foo'), {
enumerable: false,
value: 1,
});
const bar = {};
Object.defineProperty(bar, Symbol('foo'), {
enumerable: false,
value: 2,
});
expect(subsetEquality(foo, bar)).toBe(true);
});
});
});
});

describe('iterableEquality', () => {
Expand Down
24 changes: 17 additions & 7 deletions packages/expect-utils/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,23 @@ const hasPropertyInObject = (object: object, key: string | symbol): boolean => {
};

// Retrieves an object's keys for evaluation by getObjectSubset. This evaluates
// the prototype chain for string keys but not for symbols. (Otherwise, it
// could find values such as a Set or Map's Symbol.toStringTag, with unexpected
// results.)
export const getObjectKeys = (object: object): Array<string | symbol> => [
...Object.keys(object),
...Object.getOwnPropertySymbols(object),
];
// the prototype chain for string keys but not for non-enumerable symbols.
// (Otherwise, it could find values such as a Set or Map's Symbol.toStringTag,
// with unexpected results.)
// export const getObjectKeys = (object: object): Array<string | symbol> => [
// ...Object.keys(object),
// ...Object.getOwnPropertySymbols(object).filter(
// s => Object.getOwnPropertyDescriptor(object, s)?.enumerable,
// ),
// ];
export const getObjectKeys = (object: object): Array<string | symbol> => {
return [
...Object.keys(object),
...Object.getOwnPropertySymbols(object).filter(
s => Object.getOwnPropertyDescriptor(object, s)?.enumerable,
),
];
};

export const getPath = (
object: Record<string, any>,
Expand Down
Loading