diff --git a/src/matchers/toBeAfter.js b/src/matchers/toBeAfter.js index b30c93c1..5d1b7167 100644 --- a/src/matchers/toBeAfter.js +++ b/src/matchers/toBeAfter.js @@ -1,5 +1,5 @@ export function toBeAfter(date, after) { - const { printReceived, matcherHint } = this.utils; + const { printExpected, printReceived, matcherHint } = this.utils; const pass = date > after; @@ -9,11 +9,11 @@ export function toBeAfter(date, after) { pass ? matcherHint('.not.toBeAfter', 'received', '') + '\n\n' + - `Expected date to be after ${printReceived(after)} but received:\n` + + `Expected date to be after ${printExpected(after)} but received:\n` + ` ${printReceived(date)}` : matcherHint('.toBeAfter', 'received', '') + '\n\n' + - `Expected date to be after ${printReceived(after)} but received:\n` + + `Expected date to be after ${printExpected(after)} but received:\n` + ` ${printReceived(date)}`, }; } diff --git a/src/matchers/toBeAfterOrEqualTo.js b/src/matchers/toBeAfterOrEqualTo.js index 4d7b12b0..c85e4a9b 100644 --- a/src/matchers/toBeAfterOrEqualTo.js +++ b/src/matchers/toBeAfterOrEqualTo.js @@ -1,5 +1,5 @@ export function toBeAfterOrEqualTo(actual, expected) { - const { printReceived, matcherHint } = this.utils; + const { printExpected, printReceived, matcherHint } = this.utils; const pass = actual >= expected; @@ -9,11 +9,11 @@ export function toBeAfterOrEqualTo(actual, expected) { pass ? matcherHint('.not.toBeAfterOrEqualTo', 'received', '') + '\n\n' + - `Expected date to be after or equal to ${printReceived(expected)} but received:\n` + + `Expected date to be after or equal to ${printExpected(expected)} but received:\n` + ` ${printReceived(actual)}` : matcherHint('.toBeAfterOrEqualTo', 'received', '') + '\n\n' + - `Expected date to be after or equal to ${printReceived(expected)} but received:\n` + + `Expected date to be after or equal to ${printExpected(expected)} but received:\n` + ` ${printReceived(actual)}`, }; } diff --git a/src/matchers/toBeArray.js b/src/matchers/toBeArray.js index 1e0953ab..c22b393c 100644 --- a/src/matchers/toBeArray.js +++ b/src/matchers/toBeArray.js @@ -1,5 +1,5 @@ export function toBeArray(expected) { - const { matcherHint, printReceived } = this.utils; + const { printExpected, matcherHint, printReceived } = this.utils; const pass = Array.isArray(expected); @@ -10,10 +10,10 @@ export function toBeArray(expected) { ? matcherHint('.not.toBeArray', 'received', '') + '\n\n' + 'Expected value to not be an array received:\n' + - ` ${printReceived(expected)}` + ` ${printExpected(expected)}` : matcherHint('.toBeArray', 'received', '') + '\n\n' + 'Expected value to be an array received:\n' + - ` ${printReceived(expected)}`, + ` ${printExpected(expected)}`, }; } diff --git a/src/matchers/toBeBefore.js b/src/matchers/toBeBefore.js index 5711ec98..0e5b34fd 100644 --- a/src/matchers/toBeBefore.js +++ b/src/matchers/toBeBefore.js @@ -1,5 +1,5 @@ export function toBeBefore(actual, expected) { - const { matcherHint, printReceived } = this.utils; + const { printExpected, matcherHint, printReceived } = this.utils; const pass = actual < expected; @@ -9,11 +9,11 @@ export function toBeBefore(actual, expected) { pass ? matcherHint('.not.toBeBefore', 'received', '') + '\n\n' + - `Expected date to be before ${printReceived(expected)} but received:\n` + + `Expected date to be before ${printExpected(expected)} but received:\n` + ` ${printReceived(actual)}` : matcherHint('.toBeBefore', 'received', '') + '\n\n' + - `Expected date to be before ${printReceived(expected)} but received:\n` + + `Expected date to be before ${printExpected(expected)} but received:\n` + ` ${printReceived(actual)}`, }; } diff --git a/src/matchers/toBeBeforeOrEqualTo.js b/src/matchers/toBeBeforeOrEqualTo.js index a18369fa..c6e1590f 100644 --- a/src/matchers/toBeBeforeOrEqualTo.js +++ b/src/matchers/toBeBeforeOrEqualTo.js @@ -1,5 +1,5 @@ export function toBeBeforeOrEqualTo(actual, expected) { - const { matcherHint, printReceived } = this.utils; + const { matcherHint, printExpected, printReceived } = this.utils; const pass = actual <= expected; @@ -9,11 +9,11 @@ export function toBeBeforeOrEqualTo(actual, expected) { pass ? matcherHint('.not.toBeBeforeOrEqualTo', 'received', '') + '\n\n' + - `Expected date to be before or equal to ${printReceived(expected)} but received:\n` + + `Expected date to be before or equal to ${printExpected(expected)} but received:\n` + ` ${printReceived(actual)}` : matcherHint('.toBeBeforeOrEqualTo', 'received', '') + '\n\n' + - `Expected date to be before or equal to ${printReceived(expected)} but received:\n` + + `Expected date to be before or equal to ${printExpected(expected)} but received:\n` + ` ${printReceived(actual)}`, }; } diff --git a/src/matchers/toBeBetween.js b/src/matchers/toBeBetween.js index 56e1a3cc..213e8fdc 100644 --- a/src/matchers/toBeBetween.js +++ b/src/matchers/toBeBetween.js @@ -1,5 +1,5 @@ export function toBeBetween(actual, startDate, endDate) { - const { matcherHint, printReceived } = this.utils; + const { matcherHint, printExpected, printReceived } = this.utils; const pass = actual >= startDate && actual <= endDate; @@ -9,11 +9,11 @@ export function toBeBetween(actual, startDate, endDate) { pass ? matcherHint('.not.toBeBetween', 'received', '') + '\n\n' + - `Expected date to be between ${printReceived(startDate)} and ${printReceived(endDate)} but received:\n` + + `Expected date to be between ${printExpected(startDate)} and ${printExpected(endDate)} but received:\n` + ` ${printReceived(actual)}` : matcherHint('.toBeBetween', 'received', '') + '\n\n' + - `Expected date to be between ${printReceived(startDate)} and ${printReceived(endDate)} but received:\n` + + `Expected date to be between ${printExpected(startDate)} and ${printExpected(endDate)} but received:\n` + ` ${printReceived(actual)}`, }; } diff --git a/src/matchers/toBeExtensible.js b/src/matchers/toBeExtensible.js index 1ea5c993..1fbcd3ef 100644 --- a/src/matchers/toBeExtensible.js +++ b/src/matchers/toBeExtensible.js @@ -10,7 +10,7 @@ export function toBeExtensible(actual) { ? matcherHint('.not.toBeExtensible', 'received', '') + '\n\n' + 'Expected value to not be extensible received:\n' + - ` ${printExpected(actual)}\n` + ` ${printReceived(actual)}\n` : matcherHint('.toBeExtensible', 'received', '') + '\n\n' + 'Expected value to be extensible received:\n' + diff --git a/src/matchers/toBeString.js b/src/matchers/toBeString.js index 70d595c7..fdef70cd 100644 --- a/src/matchers/toBeString.js +++ b/src/matchers/toBeString.js @@ -10,7 +10,9 @@ export function toBeString(expected) { ? matcherHint('.not.toBeString', 'received', '') + '\n\n' + 'Expected value to not be of type string received:\n' + - ` ${printReceived(expected)}` + ` ${printExpected(expected)}\n` + + 'Received:\n' + + ` ${printReceived(typeof expected)}` : matcherHint('.toBeString', 'received', '') + '\n\n' + 'Expected value to be of type string:\n' +