Call chalk.inverse for trailing spaces in jest-matcher-utils (#4578)

jestjs · Oct 1, 2017 · b430e51 · b430e51
1 parent eff7a1c
commit b430e51
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap b/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap
@@ -229,6 +229,17 @@ Received:
   <red>\\"abc\\"</>"
 `;
 
+exports[`.toBe() fails for: "with 
+trailing space" and "without trailing space" 1`] = `
+"<dim>expect(</><red>received</><dim>).toBe(</><green>expected</><dim>)</>
+
+Expected value to be (using ===):
+  <green>\\"without trailing space\\"</>
+Received:
+  <red>\\"with<inverse> </></>
+<red>trailing space\\"</>"
+`;
+
 exports[`.toBe() fails for: [] and [] 1`] = `
 "<dim>expect(</><red>received</><dim>).toBe(</><green>expected</><dim>)</>
 

diff --git a/packages/expect/src/__tests__/matchers.test.js b/packages/expect/src/__tests__/matchers.test.js
@@ -120,6 +120,7 @@ describe('.toBe()', () => {
     [{a: 1}, {a: 1}],
     [{a: 1}, {a: 5}],
     ['abc', 'cde'],
+    ['with \ntrailing space', 'without trailing space'],
     [[], []],
     [null, undefined],
   ].forEach(([a, b]) => {

diff --git a/packages/expect/src/to_throw_matchers.js b/packages/expect/src/to_throw_matchers.js
@@ -13,7 +13,6 @@ import getType from 'jest-get-type';
 import {escapeStrForRegex} from 'jest-regex-util';
 import {formatStackTrace, separateMessageFromStack} from 'jest-message-util';
 import {
-  RECEIVED_BG,
   RECEIVED_COLOR,
   highlightTrailingWhitespace,
   matcherHint,
@@ -173,7 +172,7 @@ const printActualErrorMessage = error => {
       `Instead, it threw:\n` +
       RECEIVED_COLOR(
         '  ' +
-          highlightTrailingWhitespace(message, RECEIVED_BG) +
+          highlightTrailingWhitespace(message) +
           formatStackTrace(
             stack,
             {

diff --git a/packages/jest-matcher-utils/src/index.js b/packages/jest-matcher-utils/src/index.js
@@ -27,9 +27,7 @@ const PLUGINS = [
 ];
 
 export const EXPECTED_COLOR = chalk.green;
-export const EXPECTED_BG = chalk.bgGreen;
 export const RECEIVED_COLOR = chalk.red;
-export const RECEIVED_BG = chalk.bgRed;
 
 const NUMBERS = [
   'zero',
@@ -76,15 +74,13 @@ export const stringify = (object: any, maxDepth?: number = 10): string => {
     : result;
 };
 
-export const highlightTrailingWhitespace = (
-  text: string,
-  bgColor: Function,
-): string => text.replace(/\s+$/gm, bgColor('$&'));
+export const highlightTrailingWhitespace = (text: string): string =>
+  text.replace(/\s+$/gm, chalk.inverse('$&'));
 
 export const printReceived = (object: any) =>
-  highlightTrailingWhitespace(RECEIVED_COLOR(stringify(object)), RECEIVED_BG);
+  RECEIVED_COLOR(highlightTrailingWhitespace(stringify(object)));
 export const printExpected = (value: any) =>
-  highlightTrailingWhitespace(EXPECTED_COLOR(stringify(value)), EXPECTED_BG);
+  EXPECTED_COLOR(highlightTrailingWhitespace(stringify(value)));
 
 export const printWithType = (
   name: string,