From 5d89901408001bb3b70b328d15325f1b763588c0 Mon Sep 17 00:00:00 2001
From: Brent Erickson <berickson1@users.noreply.github.com>
Date: Thu, 30 Apr 2020 09:56:49 -0700
Subject: [PATCH 1/6] [@testing-library/jest-dom] Add types for
 toHaveDisplayValue

---
 types/testing-library__jest-dom/index.d.ts    | 51 ++++++++++++++++++-
 .../testing-library__jest-dom-global-tests.ts |  6 +++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/types/testing-library__jest-dom/index.d.ts b/types/testing-library__jest-dom/index.d.ts
index ba09a068368632..c35162956c8d5e 100644
--- a/types/testing-library__jest-dom/index.d.ts
+++ b/types/testing-library__jest-dom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @testing-library/jest-dom 5.6
+// Type definitions for @testing-library/jest-dom 5.7
 // Project: https://github.com/testing-library/jest-dom
 // Definitions by: Ernesto García <https://github.com/gnapse>
 //                 John Gozde <https://github.com/jgoz>
@@ -253,7 +253,54 @@ declare namespace jest {
         toHaveClass(...classNames: string[]): R;
         /**
          * @description
-         * Assert whether an element has focus or not.
+         * Check whether the given form element has the specified value.
+         *
+         * Accepts `<input>`, `<select>`, and `<textarea>` elements with the exception of `<input type="checkbox">` and
+         * `<input type="radiobox">`, which can be matched only using
+         * [toBeChecked](https:github.com/testing-library/jest-dom#tobechecked) or
+         * [toHaveFormValues](https:github.com/testing-library/jest-dom#tohaveformvalues).
+         * @example
+         * <label for="input-example">First name</label>
+         * <input type="text" id="input-example" value="Luca" />
+         *
+         * <label for="textarea-example">Description</label>
+         * <textarea id="textarea-example">An example description here.</textarea>
+         *
+         * <label for="single-select-example">Fruit</label>
+         * <select id="single-select-example">
+         *   <option value="">Select a fruit...</option>
+         *   <option value="banana">Banana</option>
+         *   <option value="ananas">Ananas</option>
+         *   <option value="avocado">Avocado</option>
+         * </select>
+         *
+         * <label for="mutiple-select-example">Fruits</label>
+         * <select id="multiple-select-example" multiple>
+         *   <option value="">Select a fruit...</option>
+         *   <option value="banana" selected>Banana</option>
+         *   <option value="ananas">Ananas</option>
+         *   <option value="avocado" selected>Avocado</option>
+         * </select>
+         *
+         * const input = screen.getByLabelText('First name')
+         * const textarea = screen.getByLabelText('Description')
+         * const selectSingle = screen.getByLabelText('Fruit')
+         * const selectMultiple = screen.getByLabelText('Fruits')
+         *
+         * expect(input).toHaveDisplayValue('Luca')
+         * expect(textarea).toHaveDisplayValue('An example description here.')
+         * expect(selectSingle).toHaveDisplayValue('Select a fruit...')
+         * expect(selectMultiple).toHaveDisplayValue(['Banana', 'Avocado'])
+         *
+         * @see
+         * [testing-library/jest-dom#tohavedisplayvalue](https:github.com/testing-library/jest-dom#tohavedisplayvalue)
+         */
+        toHaveDisplayValue(value?: string | string[]): R;
+        /**
+         * @description
+         * This allows you to check whether the given form element has the specified displayed value (the one the
+         * end user will see). It accepts <input>, <select> and <textarea> elements with the exception of <input type="checkbox">
+         * and <input type="radio">, which can be meaningfully matched only using toBeChecked or toHaveFormValues.
          * @example
          * <div>
          *   <input type="text" data-testid="element-to-focus" />
diff --git a/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts b/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
index 5aa585ed91a17b..9843ce0a935dde 100644
--- a/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
+++ b/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
@@ -19,6 +19,9 @@ expect(element).toHaveAttribute('attr', 'yes');
 expect(element).toHaveClass();
 expect(element).toHaveClass('cls1');
 expect(element).toHaveClass('cls1', 'cls2', 'cls3', 'cls4');
+expect(element).toHaveDisplayValue();
+expect(element).toHaveDisplayValue('str');
+expect(element).toHaveDisplayValue(['str1', 'str2']);
 expect(element).toHaveFocus();
 expect(element).toHaveFormValues({ foo: 'bar', baz: 1 });
 expect(element).toHaveStyle('display: block');
@@ -57,6 +60,9 @@ expect(element).not.toHaveAttribute('attr', 'yes');
 expect(element).not.toHaveClass();
 expect(element).not.toHaveClass('cls1');
 expect(element).not.toHaveClass('cls1', 'cls2', 'cls3', 'cls4');
+expect(element).not.toHaveDisplayValue();
+expect(element).not.toHaveDisplayValue('str');
+expect(element).not.toHaveDisplayValue(['str1', 'str2']);
 expect(element).not.toHaveFocus();
 expect(element).not.toHaveFormValues({ foo: 'bar', baz: 1 });
 expect(element).not.toHaveStyle('display: block');

From fac004fa7baee8d80eb043af378f3c5aa641d1eb Mon Sep 17 00:00:00 2001
From: Brent Erickson <berickson1@users.noreply.github.com>
Date: Fri, 1 May 2020 13:45:26 -0700
Subject: [PATCH 2/6] Update as per PR comments

---
 types/testing-library__jest-dom/index.d.ts                      | 2 +-
 .../test/testing-library__jest-dom-global-tests.ts              | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/testing-library__jest-dom/index.d.ts b/types/testing-library__jest-dom/index.d.ts
index c35162956c8d5e..0c4d766d1fba23 100644
--- a/types/testing-library__jest-dom/index.d.ts
+++ b/types/testing-library__jest-dom/index.d.ts
@@ -295,7 +295,7 @@ declare namespace jest {
          * @see
          * [testing-library/jest-dom#tohavedisplayvalue](https:github.com/testing-library/jest-dom#tohavedisplayvalue)
          */
-        toHaveDisplayValue(value?: string | string[]): R;
+        toHaveDisplayValue(value: string | string[]): R;
         /**
          * @description
          * This allows you to check whether the given form element has the specified displayed value (the one the
diff --git a/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts b/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
index 9843ce0a935dde..0bda939d1a618e 100644
--- a/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
+++ b/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
@@ -19,7 +19,6 @@ expect(element).toHaveAttribute('attr', 'yes');
 expect(element).toHaveClass();
 expect(element).toHaveClass('cls1');
 expect(element).toHaveClass('cls1', 'cls2', 'cls3', 'cls4');
-expect(element).toHaveDisplayValue();
 expect(element).toHaveDisplayValue('str');
 expect(element).toHaveDisplayValue(['str1', 'str2']);
 expect(element).toHaveFocus();
@@ -60,7 +59,6 @@ expect(element).not.toHaveAttribute('attr', 'yes');
 expect(element).not.toHaveClass();
 expect(element).not.toHaveClass('cls1');
 expect(element).not.toHaveClass('cls1', 'cls2', 'cls3', 'cls4');
-expect(element).not.toHaveDisplayValue();
 expect(element).not.toHaveDisplayValue('str');
 expect(element).not.toHaveDisplayValue(['str1', 'str2']);
 expect(element).not.toHaveFocus();

From 50afd283256695ad02b3076cc98a493ca8005692 Mon Sep 17 00:00:00 2001
From: Brent Erickson <berickson1@users.noreply.github.com>
Date: Thu, 7 May 2020 15:42:50 -0700
Subject: [PATCH 3/6] Update incorrect comment

---
 types/testing-library__jest-dom/index.d.ts | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/types/testing-library__jest-dom/index.d.ts b/types/testing-library__jest-dom/index.d.ts
index 0c4d766d1fba23..6a394876916286 100644
--- a/types/testing-library__jest-dom/index.d.ts
+++ b/types/testing-library__jest-dom/index.d.ts
@@ -253,12 +253,9 @@ declare namespace jest {
         toHaveClass(...classNames: string[]): R;
         /**
          * @description
-         * Check whether the given form element has the specified value.
-         *
-         * Accepts `<input>`, `<select>`, and `<textarea>` elements with the exception of `<input type="checkbox">` and
-         * `<input type="radiobox">`, which can be matched only using
-         * [toBeChecked](https:github.com/testing-library/jest-dom#tobechecked) or
-         * [toHaveFormValues](https:github.com/testing-library/jest-dom#tohaveformvalues).
+         * This allows you to check whether the given form element has the specified displayed value (the one the
+         * end user will see). It accepts <input>, <select> and <textarea> elements with the exception of <input type="checkbox">
+         * and <input type="radio">, which can be meaningfully matched only using toBeChecked or toHaveFormValues.
          * @example
          * <label for="input-example">First name</label>
          * <input type="text" id="input-example" value="Luca" />
@@ -298,9 +295,7 @@ declare namespace jest {
         toHaveDisplayValue(value: string | string[]): R;
         /**
          * @description
-         * This allows you to check whether the given form element has the specified displayed value (the one the
-         * end user will see). It accepts <input>, <select> and <textarea> elements with the exception of <input type="checkbox">
-         * and <input type="radio">, which can be meaningfully matched only using toBeChecked or toHaveFormValues.
+         * Assert whether an element has focus or not.
          * @example
          * <div>
          *   <input type="text" data-testid="element-to-focus" />

From 54295869c9d84549af89068a2149cd5dbceb0930 Mon Sep 17 00:00:00 2001
From: Brent Erickson <berickson1@users.noreply.github.com>
Date: Sat, 9 May 2020 12:06:01 -0700
Subject: [PATCH 4/6] Auto-commit github suggestion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ernesto García <gnapse@gmail.com>
---
 types/testing-library__jest-dom/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/testing-library__jest-dom/index.d.ts b/types/testing-library__jest-dom/index.d.ts
index 6a394876916286..4a041f1908c1f4 100644
--- a/types/testing-library__jest-dom/index.d.ts
+++ b/types/testing-library__jest-dom/index.d.ts
@@ -292,7 +292,7 @@ declare namespace jest {
          * @see
          * [testing-library/jest-dom#tohavedisplayvalue](https:github.com/testing-library/jest-dom#tohavedisplayvalue)
          */
-        toHaveDisplayValue(value: string | string[]): R;
+        toHaveDisplayValue(value: string | RegExp | (string|RegExp)[]): R;
         /**
          * @description
          * Assert whether an element has focus or not.

From 64b3c1291296eed7f292df2506c76c0b96625663 Mon Sep 17 00:00:00 2001
From: Brent Erickson <berickson1@users.noreply.github.com>
Date: Sun, 10 May 2020 19:59:03 -0700
Subject: [PATCH 5/6] Add tests from PR suggestions

---
 .../test/testing-library__jest-dom-global-tests.ts            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts b/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
index 0bda939d1a618e..0835e85c566dfd 100644
--- a/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
+++ b/types/testing-library__jest-dom/test/testing-library__jest-dom-global-tests.ts
@@ -21,6 +21,8 @@ expect(element).toHaveClass('cls1');
 expect(element).toHaveClass('cls1', 'cls2', 'cls3', 'cls4');
 expect(element).toHaveDisplayValue('str');
 expect(element).toHaveDisplayValue(['str1', 'str2']);
+expect(element).toHaveDisplayValue(/str/);
+expect(element).toHaveDisplayValue([/str1/, 'str2']);
 expect(element).toHaveFocus();
 expect(element).toHaveFormValues({ foo: 'bar', baz: 1 });
 expect(element).toHaveStyle('display: block');
@@ -61,6 +63,8 @@ expect(element).not.toHaveClass('cls1');
 expect(element).not.toHaveClass('cls1', 'cls2', 'cls3', 'cls4');
 expect(element).not.toHaveDisplayValue('str');
 expect(element).not.toHaveDisplayValue(['str1', 'str2']);
+expect(element).not.toHaveDisplayValue(/str/);
+expect(element).not.toHaveDisplayValue([/str1/, 'str2']);
 expect(element).not.toHaveFocus();
 expect(element).not.toHaveFormValues({ foo: 'bar', baz: 1 });
 expect(element).not.toHaveStyle('display: block');

From 30da26cf53f3713c0d4a812b67c5eb55d407486c Mon Sep 17 00:00:00 2001
From: Brent Erickson <berickson1@users.noreply.github.com>
Date: Sun, 10 May 2020 20:00:16 -0700
Subject: [PATCH 6/6] Fix compiler errors from 3df262

---
 types/testing-library__jest-dom/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/testing-library__jest-dom/index.d.ts b/types/testing-library__jest-dom/index.d.ts
index 4a041f1908c1f4..406563f5992517 100644
--- a/types/testing-library__jest-dom/index.d.ts
+++ b/types/testing-library__jest-dom/index.d.ts
@@ -292,7 +292,7 @@ declare namespace jest {
          * @see
          * [testing-library/jest-dom#tohavedisplayvalue](https:github.com/testing-library/jest-dom#tohavedisplayvalue)
          */
-        toHaveDisplayValue(value: string | RegExp | (string|RegExp)[]): R;
+        toHaveDisplayValue(value: string | RegExp | Array<string | RegExp>): R;
         /**
          * @description
          * Assert whether an element has focus or not.