Merge branch 'master' into pr/contain-html

Author: gnapse

src/__tests__/to-have-display-value.js

@@ -11,6 +11,7 @@ test('it should work as expected', () => {
   `)
 
   expect(queryByTestId('select')).toHaveDisplayValue('Select a fruit...')
+  expect(queryByTestId('select')).not.toHaveDisplayValue('Select')
   expect(queryByTestId('select')).not.toHaveDisplayValue('Banana')
   expect(() =>
     expect(queryByTestId('select')).not.toHaveDisplayValue('Select a fruit...'),
@@ -151,3 +152,13 @@ test('it should throw if element is not valid', () => {
     `".toHaveDisplayValue() currently does not support input[type=\\"checkbox\\"], try with another matcher instead."`,
   )
 })
+
+test('it should work with numbers', () => {
+  const {queryByTestId} = render(`
+    <select data-testid="select">
+      <option value="">1</option>
+    </select>
+  `)
+
+  expect(queryByTestId('select')).toHaveDisplayValue(1)
+})

src/to-have-display-value.js

@@ -1,4 +1,4 @@
-import {matches, checkHtmlElement, getMessage} from './utils'
+import {checkHtmlElement, getMessage} from './utils'
 
 export function toHaveDisplayValue(htmlElement, expectedValue) {
   checkHtmlElement(htmlElement, toHaveDisplayValue, this)
@@ -18,10 +18,13 @@ export function toHaveDisplayValue(htmlElement, expectedValue) {
 
   const values = getValues(tagName, htmlElement)
   const expectedValues = getExpectedValues(expectedValue)
-  const numberOfMatchesWithValues = getNumberOfMatchesBetweenArrays(
-    values,
-    expectedValues,
-  )
+  const numberOfMatchesWithValues = expectedValues.filter(expected =>
+    values.some(value =>
+      expected instanceof RegExp
+        ? expected.test(value)
+        : this.equals(value, String(expected)),
+    ),
+  ).length
 
   const matchedWithAllValues = numberOfMatchesWithValues === values.length
   const matchedWithAllExpectedValues =
@@ -56,9 +59,3 @@ function getValues(tagName, htmlElement) {
 function getExpectedValues(expectedValue) {
   return expectedValue instanceof Array ? expectedValue : [expectedValue]
 }
-
-function getNumberOfMatchesBetweenArrays(arrayBase, array) {
-  return array.filter(
-    expected => arrayBase.filter(value => matches(value, expected)).length,
-  ).length
-}