diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e8004209de7..24f72e8ba875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### Features +- `[expect]`: Improve report when matcher fails, part 7 ([#7866](https://github.com/facebook/jest/pull/7866)) + ### Fixes - `[jest-cli]` Refactor `-o` and `--coverage` combined ([#7611](https://github.com/facebook/jest/pull/7611)) diff --git a/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap b/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap index 1debb403a675..1ab89d930b1b 100644 --- a/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap +++ b/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap @@ -645,465 +645,465 @@ Received: undefined" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [-Infinity, -Infinity] 1`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: -Infinity -Received: -Infinity" +Expected: not >= -Infinity +Received: -Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [-Infinity, -Infinity] 2`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: -Infinity -Received: -Infinity" +Expected: not <= -Infinity +Received: -Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [1, 1] 1`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 1 -Received: 1" +Expected: not >= 1 +Received: 1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [1, 1] 2`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 1 -Received: 1" +Expected: not <= 1 +Received: 1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [1.7976931348623157e+308, 1.7976931348623157e+308] 1`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 1.7976931348623157e+308 -Received: 1.7976931348623157e+308" +Expected: not >= 1.7976931348623157e+308 +Received: 1.7976931348623157e+308" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [1.7976931348623157e+308, 1.7976931348623157e+308] 2`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 1.7976931348623157e+308 -Received: 1.7976931348623157e+308" +Expected: not <= 1.7976931348623157e+308 +Received: 1.7976931348623157e+308" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [5e-324, 5e-324] 1`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 5e-324 -Received: 5e-324" +Expected: not >= 5e-324 +Received: 5e-324" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [5e-324, 5e-324] 2`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 5e-324 -Received: 5e-324" +Expected: not <= 5e-324 +Received: 5e-324" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [Infinity, Infinity] 1`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: Infinity -Received: Infinity" +Expected: not >= Infinity +Received: Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [Infinity, Infinity] 2`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: Infinity -Received: Infinity" +Expected: not <= Infinity +Received: Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] 1`] = ` -"expect(received).toBeGreaterThan(expected) +"expect(received).toBeGreaterThan(expected) -Expected: Infinity -Received: -Infinity" +Expected: > Infinity +Received: -Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] 2`] = ` -"expect(received).not.toBeLessThan(expected) +"expect(received).not.toBeLessThan(expected) -Expected: Infinity -Received: -Infinity" +Expected: not < Infinity +Received: -Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] 3`] = ` -"expect(received).not.toBeGreaterThan(expected) +"expect(received).not.toBeGreaterThan(expected) -Expected: -Infinity -Received: Infinity" +Expected: not > -Infinity +Received: Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] 4`] = ` -"expect(received).toBeLessThan(expected) +"expect(received).toBeLessThan(expected) -Expected: -Infinity -Received: Infinity" +Expected: < -Infinity +Received: Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] 5`] = ` -"expect(received).toBeGreaterThanOrEqual(expected) +"expect(received).toBeGreaterThanOrEqual(expected) -Expected: Infinity -Received: -Infinity" +Expected: >= Infinity +Received: -Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] 6`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: Infinity -Received: -Infinity" +Expected: not <= Infinity +Received: -Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] 7`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: -Infinity -Received: Infinity" +Expected: not >= -Infinity +Received: Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] 8`] = ` -"expect(received).toBeLessThanOrEqual(expected) +"expect(received).toBeLessThanOrEqual(expected) -Expected: -Infinity -Received: Infinity" +Expected: <= -Infinity +Received: Infinity" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] 1`] = ` -"expect(received).toBeGreaterThan(expected) +"expect(received).toBeGreaterThan(expected) -Expected: 0.2 -Received: 0.1" +Expected: > 0.2 +Received: 0.1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] 2`] = ` -"expect(received).not.toBeLessThan(expected) +"expect(received).not.toBeLessThan(expected) -Expected: 0.2 -Received: 0.1" +Expected: not < 0.2 +Received: 0.1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] 3`] = ` -"expect(received).not.toBeGreaterThan(expected) +"expect(received).not.toBeGreaterThan(expected) -Expected: 0.1 -Received: 0.2" +Expected: not > 0.1 +Received: 0.2" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] 4`] = ` -"expect(received).toBeLessThan(expected) +"expect(received).toBeLessThan(expected) -Expected: 0.1 -Received: 0.2" +Expected: < 0.1 +Received: 0.2" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] 5`] = ` -"expect(received).toBeGreaterThanOrEqual(expected) +"expect(received).toBeGreaterThanOrEqual(expected) -Expected: 0.2 -Received: 0.1" +Expected: >= 0.2 +Received: 0.1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] 6`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 0.2 -Received: 0.1" +Expected: not <= 0.2 +Received: 0.1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] 7`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 0.1 -Received: 0.2" +Expected: not >= 0.1 +Received: 0.2" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] 8`] = ` -"expect(received).toBeLessThanOrEqual(expected) +"expect(received).toBeLessThanOrEqual(expected) -Expected: 0.1 -Received: 0.2" +Expected: <= 0.1 +Received: 0.2" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] 1`] = ` -"expect(received).toBeGreaterThan(expected) +"expect(received).toBeGreaterThan(expected) -Expected: 2 -Received: 1" +Expected: > 2 +Received: 1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] 2`] = ` -"expect(received).not.toBeLessThan(expected) +"expect(received).not.toBeLessThan(expected) -Expected: 2 -Received: 1" +Expected: not < 2 +Received: 1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] 3`] = ` -"expect(received).not.toBeGreaterThan(expected) +"expect(received).not.toBeGreaterThan(expected) -Expected: 1 -Received: 2" +Expected: not > 1 +Received: 2" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] 4`] = ` -"expect(received).toBeLessThan(expected) +"expect(received).toBeLessThan(expected) -Expected: 1 -Received: 2" +Expected: < 1 +Received: 2" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] 5`] = ` -"expect(received).toBeGreaterThanOrEqual(expected) +"expect(received).toBeGreaterThanOrEqual(expected) -Expected: 2 -Received: 1" +Expected: >= 2 +Received: 1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] 6`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 2 -Received: 1" +Expected: not <= 2 +Received: 1" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] 7`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 1 -Received: 2" +Expected: not >= 1 +Received: 2" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] 8`] = ` -"expect(received).toBeLessThanOrEqual(expected) +"expect(received).toBeLessThanOrEqual(expected) -Expected: 1 -Received: 2" +Expected: <= 1 +Received: 2" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] 1`] = ` -"expect(received).toBeGreaterThan(expected) +"expect(received).toBeGreaterThan(expected) -Expected: 7 -Received: 3" +Expected: > 7 +Received: 3" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] 2`] = ` -"expect(received).not.toBeLessThan(expected) +"expect(received).not.toBeLessThan(expected) -Expected: 7 -Received: 3" +Expected: not < 7 +Received: 3" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] 3`] = ` -"expect(received).not.toBeGreaterThan(expected) +"expect(received).not.toBeGreaterThan(expected) -Expected: 3 -Received: 7" +Expected: not > 3 +Received: 7" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] 4`] = ` -"expect(received).toBeLessThan(expected) +"expect(received).toBeLessThan(expected) -Expected: 3 -Received: 7" +Expected: < 3 +Received: 7" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] 5`] = ` -"expect(received).toBeGreaterThanOrEqual(expected) +"expect(received).toBeGreaterThanOrEqual(expected) -Expected: 7 -Received: 3" +Expected: >= 7 +Received: 3" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] 6`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 7 -Received: 3" +Expected: not <= 7 +Received: 3" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] 7`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 3 -Received: 7" +Expected: not >= 3 +Received: 7" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] 8`] = ` -"expect(received).toBeLessThanOrEqual(expected) +"expect(received).toBeLessThanOrEqual(expected) -Expected: 3 -Received: 7" +Expected: <= 3 +Received: 7" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] 1`] = ` -"expect(received).toBeGreaterThan(expected) +"expect(received).toBeGreaterThan(expected) -Expected: 1.7976931348623157e+308 -Received: 5e-324" +Expected: > 1.7976931348623157e+308 +Received: 5e-324" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] 2`] = ` -"expect(received).not.toBeLessThan(expected) +"expect(received).not.toBeLessThan(expected) -Expected: 1.7976931348623157e+308 -Received: 5e-324" +Expected: not < 1.7976931348623157e+308 +Received: 5e-324" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] 3`] = ` -"expect(received).not.toBeGreaterThan(expected) +"expect(received).not.toBeGreaterThan(expected) -Expected: 5e-324 -Received: 1.7976931348623157e+308" +Expected: not > 5e-324 +Received: 1.7976931348623157e+308" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] 4`] = ` -"expect(received).toBeLessThan(expected) +"expect(received).toBeLessThan(expected) -Expected: 5e-324 -Received: 1.7976931348623157e+308" +Expected: < 5e-324 +Received: 1.7976931348623157e+308" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] 5`] = ` -"expect(received).toBeGreaterThanOrEqual(expected) +"expect(received).toBeGreaterThanOrEqual(expected) -Expected: 1.7976931348623157e+308 -Received: 5e-324" +Expected: >= 1.7976931348623157e+308 +Received: 5e-324" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] 6`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 1.7976931348623157e+308 -Received: 5e-324" +Expected: not <= 1.7976931348623157e+308 +Received: 5e-324" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] 7`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 5e-324 -Received: 1.7976931348623157e+308" +Expected: not >= 5e-324 +Received: 1.7976931348623157e+308" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] 8`] = ` -"expect(received).toBeLessThanOrEqual(expected) +"expect(received).toBeLessThanOrEqual(expected) -Expected: 5e-324 -Received: 1.7976931348623157e+308" +Expected: <= 5e-324 +Received: 1.7976931348623157e+308" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] 1`] = ` -"expect(received).toBeGreaterThan(expected) +"expect(received).toBeGreaterThan(expected) -Expected: 18 -Received: 9" +Expected: > 18 +Received: 9" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] 2`] = ` -"expect(received).not.toBeLessThan(expected) +"expect(received).not.toBeLessThan(expected) -Expected: 18 -Received: 9" +Expected: not < 18 +Received: 9" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] 3`] = ` -"expect(received).not.toBeGreaterThan(expected) +"expect(received).not.toBeGreaterThan(expected) -Expected: 9 -Received: 18" +Expected: not > 9 +Received: 18" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] 4`] = ` -"expect(received).toBeLessThan(expected) +"expect(received).toBeLessThan(expected) -Expected: 9 -Received: 18" +Expected: < 9 +Received: 18" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] 5`] = ` -"expect(received).toBeGreaterThanOrEqual(expected) +"expect(received).toBeGreaterThanOrEqual(expected) -Expected: 18 -Received: 9" +Expected: >= 18 +Received: 9" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] 6`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 18 -Received: 9" +Expected: not <= 18 +Received: 9" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] 7`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 9 -Received: 18" +Expected: not >= 9 +Received: 18" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] 8`] = ` -"expect(received).toBeLessThanOrEqual(expected) +"expect(received).toBeLessThanOrEqual(expected) -Expected: 9 -Received: 18" +Expected: <= 9 +Received: 18" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] 1`] = ` -"expect(received).toBeGreaterThan(expected) +"expect(received).toBeGreaterThan(expected) -Expected: 34 -Received: 17" +Expected: > 34 +Received: 17" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] 2`] = ` -"expect(received).not.toBeLessThan(expected) +"expect(received).not.toBeLessThan(expected) -Expected: 34 -Received: 17" +Expected: not < 34 +Received: 17" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] 3`] = ` -"expect(received).not.toBeGreaterThan(expected) +"expect(received).not.toBeGreaterThan(expected) -Expected: 17 -Received: 34" +Expected: not > 17 +Received: 34" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] 4`] = ` -"expect(received).toBeLessThan(expected) +"expect(received).toBeLessThan(expected) -Expected: 17 -Received: 34" +Expected: < 17 +Received: 34" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] 5`] = ` -"expect(received).toBeGreaterThanOrEqual(expected) +"expect(received).toBeGreaterThanOrEqual(expected) -Expected: 34 -Received: 17" +Expected: >= 34 +Received: 17" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] 6`] = ` -"expect(received).not.toBeLessThanOrEqual(expected) +"expect(received).not.toBeLessThanOrEqual(expected) -Expected: 34 -Received: 17" +Expected: not <= 34 +Received: 17" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] 7`] = ` -"expect(received).not.toBeGreaterThanOrEqual(expected) +"expect(received).not.toBeGreaterThanOrEqual(expected) -Expected: 17 -Received: 34" +Expected: not >= 17 +Received: 34" `; exports[`.toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] 8`] = ` -"expect(received).toBeLessThanOrEqual(expected) +"expect(received).toBeLessThanOrEqual(expected) -Expected: 17 -Received: 34" +Expected: <= 17 +Received: 34" `; exports[`.toBeInstanceOf() failing "a" and [Function String] 1`] = ` diff --git a/packages/expect/src/matchers.js b/packages/expect/src/matchers.js index 298f1d1cb681..844d6fc1b986 100644 --- a/packages/expect/src/matchers.js +++ b/packages/expect/src/matchers.js @@ -144,29 +144,41 @@ const matchers: MatchersObject = { return {message, pass}; }, - toBeGreaterThan(actual: number, expected: number) { - ensureNumbers(actual, expected, '.toBeGreaterThan'); - const pass = actual > expected; + toBeGreaterThan(received: number, expected: number) { + const isNot = this.isNot; + const options = { + isNot, + promise: this.promise, + }; + ensureNumbers(received, expected, '.toBeGreaterThan'); + + const pass = received > expected; + const message = () => - matcherHint('.toBeGreaterThan', undefined, undefined, { - isNot: this.isNot, - }) + + matcherHint('toBeGreaterThan', undefined, undefined, options) + '\n\n' + - `Expected: ${printExpected(expected)}\n` + - `Received: ${printReceived(actual)}`; + `Expected:${isNot ? ' not' : ''} > ${printExpected(expected)}\n` + + `Received:${isNot ? ' ' : ''} ${printReceived(received)}`; + return {message, pass}; }, - toBeGreaterThanOrEqual(actual: number, expected: number) { - ensureNumbers(actual, expected, '.toBeGreaterThanOrEqual'); - const pass = actual >= expected; + toBeGreaterThanOrEqual(received: number, expected: number) { + const isNot = this.isNot; + const options = { + isNot, + promise: this.promise, + }; + ensureNumbers(received, expected, '.toBeGreaterThanOrEqual'); + + const pass = received >= expected; + const message = () => - matcherHint('.toBeGreaterThanOrEqual', undefined, undefined, { - isNot: this.isNot, - }) + + matcherHint('toBeGreaterThanOrEqual', undefined, undefined, options) + '\n\n' + - `Expected: ${printExpected(expected)}\n` + - `Received: ${printReceived(actual)}`; + `Expected:${isNot ? ' not' : ''} >= ${printExpected(expected)}\n` + + `Received:${isNot ? ' ' : ''} ${printReceived(received)}`; + return {message, pass}; }, @@ -214,29 +226,41 @@ const matchers: MatchersObject = { return {message, pass}; }, - toBeLessThan(actual: number, expected: number) { - ensureNumbers(actual, expected, '.toBeLessThan'); - const pass = actual < expected; + toBeLessThan(received: number, expected: number) { + const isNot = this.isNot; + const options = { + isNot, + promise: this.promise, + }; + ensureNumbers(received, expected, '.toBeLessThan'); + + const pass = received < expected; + const message = () => - matcherHint('.toBeLessThan', undefined, undefined, { - isNot: this.isNot, - }) + + matcherHint('toBeLessThan', undefined, undefined, options) + '\n\n' + - `Expected: ${printExpected(expected)}\n` + - `Received: ${printReceived(actual)}`; + `Expected:${isNot ? ' not' : ''} < ${printExpected(expected)}\n` + + `Received:${isNot ? ' ' : ''} ${printReceived(received)}`; + return {message, pass}; }, - toBeLessThanOrEqual(actual: number, expected: number) { - ensureNumbers(actual, expected, '.toBeLessThanOrEqual'); - const pass = actual <= expected; + toBeLessThanOrEqual(received: number, expected: number) { + const isNot = this.isNot; + const options = { + isNot, + promise: this.promise, + }; + ensureNumbers(received, expected, '.toBeLessThanOrEqual'); + + const pass = received <= expected; + const message = () => - matcherHint('.toBeLessThanOrEqual', undefined, undefined, { - isNot: this.isNot, - }) + + matcherHint('toBeLessThanOrEqual', undefined, undefined, options) + '\n\n' + - `Expected: ${printExpected(expected)}\n` + - `Received: ${printReceived(actual)}`; + `Expected:${isNot ? ' not' : ''} <= ${printExpected(expected)}\n` + + `Received:${isNot ? ' ' : ''} ${printReceived(received)}`; + return {message, pass}; },