fix for getMessage

Author: microcood

src/__tests__/__snapshots__/index.js.snap

@@ -93,61 +93,61 @@ exports[`.toHaveClass 1`] = `
 "<dim>expect(</><red>element</><dim>).not.toHaveClass(</><green><green>\\"btn\\"<green></><dim>)</>
 
 Expected the element not to have class:
-<green>  btn</>
+  <green>btn</>
 Received:
-<red>  btn extra btn-danger</>"
+  <red>btn extra btn-danger</>"
 `;
 
 exports[`.toHaveClass 2`] = `
 "<dim>expect(</><red>element</><dim>).not.toHaveClass(</><green><green>\\"btn-danger\\"<green></><dim>)</>
 
 Expected the element not to have class:
-<green>  btn-danger</>
+  <green>btn-danger</>
 Received:
-<red>  btn extra btn-danger</>"
+  <red>btn extra btn-danger</>"
 `;
 
 exports[`.toHaveClass 3`] = `
 "<dim>expect(</><red>element</><dim>).not.toHaveClass(</><green><green>\\"extra\\"<green></><dim>)</>
 
 Expected the element not to have class:
-<green>  extra</>
+  <green>extra</>
 Received:
-<red>  btn extra btn-danger</>"
+  <red>btn extra btn-danger</>"
 `;
 
 exports[`.toHaveClass 4`] = `
 "<dim>expect(</><red>element</><dim>).toHaveClass(</><green><green>\\"xtra\\"<green></><dim>)</>
 
 Expected the element to have class:
-<green>  xtra</>
+  <green>xtra</>
 Received:
-<red>  btn extra btn-danger</>"
+  <red>btn extra btn-danger</>"
 `;
 
 exports[`.toHaveClass 5`] = `
 "<dim>expect(</><red>element</><dim>).not.toHaveClass(</><green><green>\\"btn btn-danger\\"<green></><dim>)</>
 
 Expected the element not to have class:
-<green>  btn btn-danger</>
+  <green>btn btn-danger</>
 Received:
-<red>  btn extra btn-danger</>"
+  <red>btn extra btn-danger</>"
 `;
 
 exports[`.toHaveClass 6`] = `
 "<dim>expect(</><red>element</><dim>).toHaveClass(</><green><green>\\"btn-link\\"<green></><dim>)</>
 
 Expected the element to have class:
-<green>  btn-link</>
+  <green>btn-link</>
 Received:
-<red>  btn extra btn-danger</>"
+  <red>btn extra btn-danger</>"
 `;
 
 exports[`.toHaveClass 7`] = `
 "<dim>expect(</><red>element</><dim>).toHaveClass(</><green><green>\\"btn-danger\\"<green></><dim>)</>
 
 Expected the element to have class:
-<green>  btn-danger</>
+  <green>btn-danger</>
 Received:
 "
 `;
@@ -183,16 +183,16 @@ exports[`.toHaveTextContent 2`] = `
 "<dim>expect(</><red>element</><dim>).toHaveTextContent(</><dim>)</>
 
 Expected element to have text content:
-<green>  3</>
+  <green>3</>
 Received:
-<red>  2</>"
+  <red>2</>"
 `;
 
 exports[`.toHaveTextContent 3`] = `
 "<dim>expect(</><red>element</><dim>).not.toHaveTextContent(</><dim>)</>
 
 Expected element not to have text content:
-<green>  2</>
+  <green>2</>
 Received:
-<red>  2</>"
+  <red>2</>"
 `;

src/to-have-attribute.js

@@ -1,11 +1,5 @@
-import {
-  matcherHint,
-  stringify,
-  printExpected,
-  RECEIVED_COLOR as receivedColor,
-  EXPECTED_COLOR as expectedColor,
-} from 'jest-matcher-utils'
-import {checkHtmlElement} from './utils'
+import {matcherHint, stringify, printExpected} from 'jest-matcher-utils'
+import {checkHtmlElement, getMessage} from './utils'
 
 function printAttribute(name, value) {
   return value === undefined ? name : `${name}=${stringify(value)}`
@@ -42,14 +36,13 @@ export function toHaveAttribute(htmlElement, name, expectedValue) {
           comment: getAttributeComment(name, expectedValue),
         },
       )
-      return [
+      return getMessage(
         matcher,
-        '',
-        `Expected the element ${to} have attribute:`,
-        `  ${expectedColor(printAttribute(name, expectedValue))}`,
-        'Received:',
-        `  ${receivedColor(receivedAttribute)}`,
-      ].join('\n')
+        `Expected the element ${to} have attribute`,
+        printAttribute(name, expectedValue),
+        'Received',
+        receivedAttribute,
+      )
     },
   }
 }

src/utils.js

@@ -43,8 +43,8 @@ function getMessage(
 ) {
   return [
     `${matcher}\n`,
-    `${expectedLabel}:\n${expectedColor(redent(expectedValue, 2))}`,
-    `${receivedLabel}:\n${receivedColor(redent(receivedValue, 2))}`,
+    `${expectedLabel}:\n${redent(expectedColor(expectedValue), 2)}`,
+    `${receivedLabel}:\n${redent(receivedColor(receivedValue), 2)}`,
   ].join('\n')
 }