Skip to content
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
2 changes: 2 additions & 0 deletions packages/expect/src/jest-expect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,7 @@ export const JestChaiExpect: ChaiPlugin = (chai, utils) => {
promise,
createAssertionMessage(utils, this, !!args.length),
error,
utils.flag(this, 'soft'),
)
}
},
Expand Down Expand Up @@ -1203,6 +1204,7 @@ export const JestChaiExpect: ChaiPlugin = (chai, utils) => {
promise,
createAssertionMessage(utils, this, !!args.length),
error,
utils.flag(this, 'soft'),
)
}
},
Expand Down
23 changes: 23 additions & 0 deletions test/cli/fixtures/expect-soft/expects/soft.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,29 @@ test('promise with expect.extend', async () => {
await expect.soft(2 + 2).toBeAsync(3);
});

test('promise rejection', async () => {
await expect
.soft(
Promise.resolve().then(() => {
throw new Error('boom 1st')
}),
)
.resolves.toBe('1st')

await expect
.soft(
Promise.resolve().then(() => {
throw new Error('boom 2nd')
}),
)
.resolves.toBe('2nd')
})

test('promise resolved instead of rejecting', async () => {
await expect.soft(Promise.resolve('value 1')).rejects.toBe('1st')
await expect.soft(Promise.resolve('value 2')).rejects.toBe('2nd')
})

test('passed', () => {
expect.soft(1).toEqual(1)
expect(10).toEqual(10)
Expand Down
14 changes: 14 additions & 0 deletions test/cli/test/expect-soft.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,20 @@ describe('expect.soft', () => {
expect.soft(stderr).toContain('Error: expected 4 to be 3')
})

test('promise rejection', async () => {
const { stderr } = await run()
// both assertions should execute (not abort after first rejection)
expect.soft(stderr).toContain('promise rejected "Error: boom 1st" instead of resolving')
expect.soft(stderr).toContain('promise rejected "Error: boom 2nd" instead of resolving')
})

test('promise resolved instead of rejecting', async () => {
const { stderr } = await run()
// both assertions should execute
expect.soft(stderr).toContain('promise resolved "\'value 1\'" instead of rejecting')
expect.soft(stderr).toContain('promise resolved "\'value 2\'" instead of rejecting')
})

test('passed', async () => {
const { stdout } = await run()
expect.soft(stdout).toContain('soft.test.ts > passed')
Expand Down
Loading