Skip to content

[pull] main from vitest-dev:main #273

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

Merged
pull merged 1 commit into from
Jan 30, 2026
+76 −2
Merged

[pull] main from vitest-dev:main #273

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
4 changes: 2 additions & 2 deletions packages/expect/src/jest-asymmetric-matchers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ export class ObjectContaining extends AsymmetricMatcher<
result = false
break
}
const value = Object.getOwnPropertyDescriptor(this.sample, property)?.value ?? this.sample[property]
const otherValue = Object.getOwnPropertyDescriptor(other, property)?.value ?? other[property]
const value = this.sample[property]
const otherValue = other[property]
if (!equals(
value,
otherValue,
Expand Down
74 changes: 74 additions & 0 deletions test/core/test/jest-expect.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,6 +1365,80 @@ it('toMatchObject', () => {
expect(new Map()).toMatchObject({})
})

it('proxy equality', () => {
// { intercepted: 'original', passthrough: 'original' } => { intercepted: 'proxied', passthrough: 'original' }
const proxyActual = new Proxy({ intercepted: 'original', passthrough: 'original' }, {
get(target, prop, receiver) {
if (prop === 'intercepted') {
return 'proxied'
}
return Reflect.get(target, prop, receiver)
},
})
// { intercepted: 'original' } => { intercepted: 'proxied' }
const proxyExpected = new Proxy({ intercepted: 'original' }, {
get(target, prop, receiver) {
if (prop === 'intercepted') {
return 'proxied'
}
return Reflect.get(target, prop, receiver)
},
})

// objectContaining
expect(proxyActual).toEqual(expect.objectContaining({ intercepted: 'proxied', passthrough: 'original' }))
expect(proxyActual).not.toEqual(expect.objectContaining({ intercepted: 'original' }))
expect({ intercepted: 'proxied', extra: 'ignored' }).toEqual(expect.objectContaining(proxyExpected))
expect({ intercepted: 'original' }).not.toEqual(expect.objectContaining(proxyExpected))

// toMatchObject
expect(proxyActual).toMatchObject({ intercepted: 'proxied', passthrough: 'original' })
expect(proxyActual).not.toMatchObject({ intercepted: 'original' })
expect({ intercepted: 'proxied', extra: 'ignored' }).toMatchObject(proxyExpected)
expect({ intercepted: 'original' }).not.toMatchObject(proxyExpected)

// toEqual
expect(proxyActual).toEqual({ intercepted: 'proxied', passthrough: 'original' })
expect(proxyActual).not.toEqual({ intercepted: 'original', passthrough: 'original' })
expect({ intercepted: 'proxied' }).toEqual(proxyExpected)
expect({ intercepted: 'original' }).not.toEqual(proxyExpected)

// empty target proxy with only `get` trap
const proxyBad = new Proxy({} as any, {
get(target, prop, receiver) {
if (prop === 'virtual') {
return 'value'
}
return Reflect.get(target, prop, receiver)
},
})
expect(proxyBad).not.toEqual(expect.objectContaining({ virtual: 'value' }))
expect(proxyBad).not.toMatchObject({ virtual: 'value' })
expect(proxyBad).not.toEqual({ virtual: 'value' })
expect({ virtual: 'value' }).not.toEqual(proxyBad)

// empty target proxy with required traps
const proxyGood = new Proxy({}, {
get(target, prop, receiver) {
if (prop === 'virtual') {
return 'value'
}
return Reflect.get(target, prop, receiver)
},
ownKeys: () => ['virtual'],
getOwnPropertyDescriptor(target, prop) {
if (prop === 'virtual') {
return { enumerable: true, configurable: true, value: 'value' }
}
return Reflect.getOwnPropertyDescriptor(target, prop)
},
})
expect(proxyGood).toEqual({ virtual: 'value' })
expect(proxyGood).toMatchObject({ virtual: 'value' })
expect(proxyGood).toEqual(expect.objectContaining({ virtual: 'value' }))
expect({ virtual: 'value' }).toEqual(proxyGood)
})

it('toMatchObject error diff', () => {
// single property on root (3 total properties, 1 expected)
expect(getError(() => expect({ a: 1, b: 2, c: 3 }).toMatchObject({ c: 4 }))).toMatchInlineSnapshot(`
Expand Down
Loading