From fe9e6f1c45da4fc7130e24acf3084d80918c833c Mon Sep 17 00:00:00 2001
From: siepra <wiktor.siepra@gmail.com>
Date: Mon, 11 Sep 2023 16:31:04 +0200
Subject: [PATCH 01/12] feat: add toContainElement matcher

---
 .../__tests__/to-contain-element.test.tsx     | 38 +++++++++++++++++
 src/matchers/extend-expect.d.ts               |  2 +
 src/matchers/extend-expect.ts                 |  2 +
 src/matchers/index.tsx                        |  1 +
 src/matchers/to-contain-element.tsx           | 41 +++++++++++++++++++
 src/matchers/utils.tsx                        | 27 ++++++++++++
 6 files changed, 111 insertions(+)
 create mode 100644 src/matchers/__tests__/to-contain-element.test.tsx
 create mode 100644 src/matchers/to-contain-element.tsx

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
new file mode 100644
index 000000000..f446740ed
--- /dev/null
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -0,0 +1,38 @@
+import * as React from 'react';
+import { View } from 'react-native';
+import { render, screen } from '../..';
+import '../extend-expect';
+
+test('toContainElement() on parent view', () => {
+  render(
+    <View testID="parent">
+      <View testID="child" />
+    </View>
+  );
+
+  const parent = screen.getByTestId('parent');
+  const child = screen.getByTestId('child');
+
+  expect(parent).toContainElement(child);
+
+  expect(() => expect(parent).not.toContainElement(child))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "expect(element).not.toContainElement(element)
+
+      <View
+        children={
+          <View
+            testID="child"
+          />
+        }
+        testID="parent"
+      /> 
+
+    contains:
+
+       <View
+        testID="child"
+      />
+            "
+  `);
+});
diff --git a/src/matchers/extend-expect.d.ts b/src/matchers/extend-expect.d.ts
index 54e02213c..875a4fb50 100644
--- a/src/matchers/extend-expect.d.ts
+++ b/src/matchers/extend-expect.d.ts
@@ -1,4 +1,5 @@
 import type { StyleProp } from 'react-native';
+import { ReactTestInstance } from 'react-test-renderer';
 import type { TextMatch, TextMatchOptions } from '../matches';
 import type { Style } from './to-have-style';
 
@@ -12,6 +13,7 @@ export interface JestNativeMatchers<R> {
   toBePartiallyChecked(): R;
   toBeSelected(): R;
   toBeVisible(): R;
+  toContainElement(element: ReactTestInstance | null): R;
   toHaveDisplayValue(expectedValue: TextMatch, options?: TextMatchOptions): R;
   toHaveProp(name: string, expectedValue?: unknown): R;
   toHaveStyle(style: StyleProp<Style>): R;
diff --git a/src/matchers/extend-expect.ts b/src/matchers/extend-expect.ts
index abbe613e7..aaad5ba32 100644
--- a/src/matchers/extend-expect.ts
+++ b/src/matchers/extend-expect.ts
@@ -8,6 +8,7 @@ import { toBeEmptyElement } from './to-be-empty-element';
 import { toBePartiallyChecked } from './to-be-partially-checked';
 import { toBeSelected } from './to-be-selected';
 import { toBeVisible } from './to-be-visible';
+import { toContainElement } from './to-contain-element';
 import { toHaveDisplayValue } from './to-have-display-value';
 import { toHaveProp } from './to-have-prop';
 import { toHaveStyle } from './to-have-style';
@@ -23,6 +24,7 @@ expect.extend({
   toBePartiallyChecked,
   toBeSelected,
   toBeVisible,
+  toContainElement,
   toHaveDisplayValue,
   toHaveProp,
   toHaveStyle,
diff --git a/src/matchers/index.tsx b/src/matchers/index.tsx
index d5d2b8eb1..8d9f52785 100644
--- a/src/matchers/index.tsx
+++ b/src/matchers/index.tsx
@@ -10,3 +10,4 @@ export { toHaveProp } from './to-have-prop';
 export { toHaveStyle } from './to-have-style';
 export { toHaveTextContent } from './to-have-text-content';
 export { toBeSelected } from './to-be-selected';
+export { toContainElement } from './to-contain-element';
diff --git a/src/matchers/to-contain-element.tsx b/src/matchers/to-contain-element.tsx
new file mode 100644
index 000000000..8e5219038
--- /dev/null
+++ b/src/matchers/to-contain-element.tsx
@@ -0,0 +1,41 @@
+import { ReactTestInstance } from 'react-test-renderer';
+import { matcherHint, RECEIVED_COLOR as receivedColor } from 'jest-matcher-utils';
+import { checkHostElement, printElement } from './utils';
+
+export function toContainElement(
+  this: jest.MatcherContext,
+  container: ReactTestInstance,
+  element: ReactTestInstance | null
+) {
+  if (element !== null || !this.isNot) {
+    checkHostElement(element, toContainElement, this);
+  }
+
+  let matches = [];
+
+  if (element) {
+    matches = container.findAll((node) => {
+      return (
+        node.type === element.type && this.equals(node.props, element.props)
+      );
+    });
+  }
+
+  return {
+    pass: Boolean(matches.length),
+    message: () => {
+      return [
+        matcherHint(
+          `${this.isNot ? '.not' : ''}.toContainElement`,
+          'element',
+          'element'
+        ),
+        '',
+        receivedColor(`${printElement(container)} ${
+          this.isNot ? '\n\ncontains:\n\n' : '\n\ndoes not contain:\n\n'
+        } ${printElement(element)}
+        `),
+      ].join('\n');
+    },
+  };
+}
diff --git a/src/matchers/utils.tsx b/src/matchers/utils.tsx
index b79b65b3e..fc48b5d90 100644
--- a/src/matchers/utils.tsx
+++ b/src/matchers/utils.tsx
@@ -12,6 +12,8 @@ import redent from 'redent';
 import { isHostElement } from '../helpers/component-tree';
 import { defaultMapProps } from '../helpers/format-default';
 
+const { ReactTestComponent, ReactElement } = plugins;
+
 class HostElementTypeError extends Error {
   constructor(
     received: unknown,
@@ -127,3 +129,28 @@ export function formatMessage(
 function formatValue(value: unknown) {
   return typeof value === 'string' ? value : stringify(value);
 }
+
+export function printElement(element: ReactTestInstance | null) {
+  if (element == null) {
+    return 'null';
+  }
+
+  return redent(
+    prettyFormat(
+      {
+        // This prop is needed persuade the prettyFormat that the element is
+        // a ReactTestRendererJSON instance, so it is formatted as JSX.
+        $$typeof: Symbol.for('react.test.json'),
+        type: element.type,
+        props: element.props,
+      },
+      {
+        plugins: [ReactTestComponent, ReactElement],
+        printFunctionName: false,
+        printBasicPrototype: false,
+        highlight: true,
+      }
+    ),
+    2
+  );
+}

From df01c72bc00bf0d25bc9e050312c97566429612d Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor.sieprawski@rumblefish.pl>
Date: Mon, 11 Sep 2023 22:27:41 +0200
Subject: [PATCH 02/12] chore: replace printElement with formatElement

---
 .../__tests__/to-contain-element.test.tsx     |  5 ----
 src/matchers/to-contain-element.tsx           |  6 ++---
 src/matchers/utils.tsx                        | 27 -------------------
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
index f446740ed..ea0bf15d2 100644
--- a/src/matchers/__tests__/to-contain-element.test.tsx
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -20,11 +20,6 @@ test('toContainElement() on parent view', () => {
     "expect(element).not.toContainElement(element)
 
       <View
-        children={
-          <View
-            testID="child"
-          />
-        }
         testID="parent"
       /> 
 
diff --git a/src/matchers/to-contain-element.tsx b/src/matchers/to-contain-element.tsx
index 8e5219038..782e24d50 100644
--- a/src/matchers/to-contain-element.tsx
+++ b/src/matchers/to-contain-element.tsx
@@ -1,6 +1,6 @@
 import { ReactTestInstance } from 'react-test-renderer';
 import { matcherHint, RECEIVED_COLOR as receivedColor } from 'jest-matcher-utils';
-import { checkHostElement, printElement } from './utils';
+import { checkHostElement, formatElement } from './utils';
 
 export function toContainElement(
   this: jest.MatcherContext,
@@ -31,9 +31,9 @@ export function toContainElement(
           'element'
         ),
         '',
-        receivedColor(`${printElement(container)} ${
+        receivedColor(`${formatElement(container)} ${
           this.isNot ? '\n\ncontains:\n\n' : '\n\ndoes not contain:\n\n'
-        } ${printElement(element)}
+        } ${formatElement(element)}
         `),
       ].join('\n');
     },
diff --git a/src/matchers/utils.tsx b/src/matchers/utils.tsx
index fc48b5d90..b79b65b3e 100644
--- a/src/matchers/utils.tsx
+++ b/src/matchers/utils.tsx
@@ -12,8 +12,6 @@ import redent from 'redent';
 import { isHostElement } from '../helpers/component-tree';
 import { defaultMapProps } from '../helpers/format-default';
 
-const { ReactTestComponent, ReactElement } = plugins;
-
 class HostElementTypeError extends Error {
   constructor(
     received: unknown,
@@ -129,28 +127,3 @@ export function formatMessage(
 function formatValue(value: unknown) {
   return typeof value === 'string' ? value : stringify(value);
 }
-
-export function printElement(element: ReactTestInstance | null) {
-  if (element == null) {
-    return 'null';
-  }
-
-  return redent(
-    prettyFormat(
-      {
-        // This prop is needed persuade the prettyFormat that the element is
-        // a ReactTestRendererJSON instance, so it is formatted as JSX.
-        $$typeof: Symbol.for('react.test.json'),
-        type: element.type,
-        props: element.props,
-      },
-      {
-        plugins: [ReactTestComponent, ReactElement],
-        printFunctionName: false,
-        printBasicPrototype: false,
-        highlight: true,
-      }
-    ),
-    2
-  );
-}

From e34ee52432c86214c3020410fc05206d8655061a Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor.sieprawski@rumblefish.pl>
Date: Mon, 11 Sep 2023 22:40:09 +0200
Subject: [PATCH 03/12] chore: mimic jest-dom instead of jest-native

---
 src/matchers/to-contain-element.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/matchers/to-contain-element.tsx b/src/matchers/to-contain-element.tsx
index 782e24d50..918220bdd 100644
--- a/src/matchers/to-contain-element.tsx
+++ b/src/matchers/to-contain-element.tsx
@@ -11,14 +11,10 @@ export function toContainElement(
     checkHostElement(element, toContainElement, this);
   }
 
-  let matches = [];
+  let matches: ReactTestInstance[] = [];
 
   if (element) {
-    matches = container.findAll((node) => {
-      return (
-        node.type === element.type && this.equals(node.props, element.props)
-      );
-    });
+    matches = container.findAll((node) => node === element);
   }
 
   return {

From 225ec9680084dfb2ba139f395f19939556cdd2fb Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor.sieprawski@rumblefish.pl>
Date: Tue, 12 Sep 2023 17:33:21 +0200
Subject: [PATCH 04/12] fix: checking host element

---
 .../__tests__/to-contain-element.test.tsx     | 24 +++++++++++++++++++
 src/matchers/to-contain-element.tsx           |  7 ++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
index ea0bf15d2..8e25c6994 100644
--- a/src/matchers/__tests__/to-contain-element.test.tsx
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -31,3 +31,27 @@ test('toContainElement() on parent view', () => {
             "
   `);
 });
+
+test('toContainElement() on non-React elements', () => {
+  render(<View testID="view" />);
+
+  const view = screen.getByTestId('view');
+
+  expect(() => expect({ name: 'Non-React element' }).not.toContainElement(view))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "expect(received).not.toContainElement()
+
+    received value must be a host element.
+    Received has type:  object
+    Received has value: {"name": "Non-React element"}"
+  `);
+
+  expect(() => expect(true).not.toContainElement(view))
+    .toThrowErrorMatchingInlineSnapshot(`
+      "expect(received).not.toContainElement()
+
+      received value must be a host element.
+      Received has type:  boolean
+      Received has value: true"
+    `);
+});
diff --git a/src/matchers/to-contain-element.tsx b/src/matchers/to-contain-element.tsx
index 918220bdd..5859e1096 100644
--- a/src/matchers/to-contain-element.tsx
+++ b/src/matchers/to-contain-element.tsx
@@ -1,5 +1,8 @@
 import { ReactTestInstance } from 'react-test-renderer';
-import { matcherHint, RECEIVED_COLOR as receivedColor } from 'jest-matcher-utils';
+import {
+  matcherHint,
+  RECEIVED_COLOR as receivedColor,
+} from 'jest-matcher-utils';
 import { checkHostElement, formatElement } from './utils';
 
 export function toContainElement(
@@ -8,7 +11,7 @@ export function toContainElement(
   element: ReactTestInstance | null
 ) {
   if (element !== null || !this.isNot) {
-    checkHostElement(element, toContainElement, this);
+    checkHostElement(container, toContainElement, this);
   }
 
   let matches: ReactTestInstance[] = [];

From cb3ef7e9fc6668d19c5e3291a868d1fa6c15b983 Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor.sieprawski@rumblefish.pl>
Date: Tue, 12 Sep 2023 17:40:33 +0200
Subject: [PATCH 05/12] test: passing null as argument

---
 .../__tests__/to-contain-element.test.tsx     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
index 8e25c6994..f8a8824f5 100644
--- a/src/matchers/__tests__/to-contain-element.test.tsx
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -32,6 +32,28 @@ test('toContainElement() on parent view', () => {
   `);
 });
 
+test('toContainElement() passing null', () => {
+  render(<View testID="view" />);
+
+  const view = screen.getByTestId('view');
+
+  expect(view).not.toContainElement(null);
+
+  expect(() => expect(view).toContainElement(null))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "expect(element).toContainElement(element)
+
+      <View
+        testID="view"
+      /> 
+
+    does not contain:
+
+       null
+            "
+  `);
+});
+
 test('toContainElement() on non-React elements', () => {
   render(<View testID="view" />);
 

From d645738eea146a3cbdff363234d9097e01b9e717 Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor.sieprawski@rumblefish.pl>
Date: Tue, 12 Sep 2023 17:41:34 +0200
Subject: [PATCH 06/12] chore: rename basic test case

---
 src/matchers/__tests__/to-contain-element.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
index f8a8824f5..7b5439310 100644
--- a/src/matchers/__tests__/to-contain-element.test.tsx
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -3,7 +3,7 @@ import { View } from 'react-native';
 import { render, screen } from '../..';
 import '../extend-expect';
 
-test('toContainElement() on parent view', () => {
+test('toContainElement() supports basic case', () => {
   render(
     <View testID="parent">
       <View testID="child" />

From 972d6e38817946bc75dd68d4b3dc82bb998c2b88 Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor.sieprawski@rumblefish.pl>
Date: Tue, 12 Sep 2023 17:46:18 +0200
Subject: [PATCH 07/12] test: negative case

---
 .../__tests__/to-contain-element.test.tsx     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
index 7b5439310..9d3f98066 100644
--- a/src/matchers/__tests__/to-contain-element.test.tsx
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -32,6 +32,36 @@ test('toContainElement() supports basic case', () => {
   `);
 });
 
+test('toContainElement() supports negative case', () => {
+  render(
+    <>
+      <View testID="view1" />
+      <View testID="view2" />
+    </>
+  );
+
+  const view1 = screen.getByTestId('view1');
+  const view2 = screen.getByTestId('view2');
+
+  expect(view1).not.toContainElement(view2);
+
+  expect(() => expect(view1).toContainElement(view2))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "expect(element).toContainElement(element)
+
+      <View
+        testID="view1"
+      /> 
+
+    does not contain:
+
+       <View
+        testID="view2"
+      />
+            "
+  `);
+});
+
 test('toContainElement() passing null', () => {
   render(<View testID="view" />);
 

From 48002c33aacee9ae42c92a3c5386fbecb59a7786 Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor.sieprawski@rumblefish.pl>
Date: Tue, 12 Sep 2023 17:55:32 +0200
Subject: [PATCH 08/12] test: on null elements

---
 src/matchers/__tests__/to-contain-element.test.tsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
index 9d3f98066..cb3062153 100644
--- a/src/matchers/__tests__/to-contain-element.test.tsx
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -84,6 +84,20 @@ test('toContainElement() passing null', () => {
   `);
 });
 
+test('toContainElement() on null elements', () => {
+  render(<View testID="view" />);
+
+  const view = screen.getByTestId('view');
+
+  expect(() => expect(null).toContainElement(view))
+    .toThrowErrorMatchingInlineSnapshot(`
+      "expect(received).toContainElement()
+
+      received value must be a host element.
+      Received has value: null"
+    `);
+});
+
 test('toContainElement() on non-React elements', () => {
   render(<View testID="view" />);
 

From 3d3b1b0600a731a0901a0d341d03a7291cb2de26 Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor.sieprawski@rumblefish.pl>
Date: Tue, 19 Sep 2023 10:12:25 +0200
Subject: [PATCH 09/12] fix: validating host container and element

---
 .../__tests__/to-contain-element.test.tsx     | 28 +++++++++++++++++++
 src/matchers/to-contain-element.tsx           |  6 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
index cb3062153..7ef61e603 100644
--- a/src/matchers/__tests__/to-contain-element.test.tsx
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -121,3 +121,31 @@ test('toContainElement() on non-React elements', () => {
       Received has value: true"
     `);
 });
+
+test('toContainElement() passing non-React element', () => {
+  render(<View testID="view" />);
+
+  const view = screen.getByTestId('view');
+
+  expect(() =>
+    // @ts-expect-error
+    expect(view).not.toContainElement(true)
+  ).toThrowErrorMatchingInlineSnapshot(`
+    "expect(received).not.toContainElement()
+
+    received value must be a host element.
+    Received has type:  boolean
+    Received has value: true"
+  `);
+});
+
+test('toContainElement() passing null on non-React element', () => {
+  expect(() => expect(true).not.toContainElement(null))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "expect(received).not.toContainElement()
+
+    received value must be a host element.
+    Received has type:  boolean
+    Received has value: true"
+  `);
+});
diff --git a/src/matchers/to-contain-element.tsx b/src/matchers/to-contain-element.tsx
index 5859e1096..07d07b7bb 100644
--- a/src/matchers/to-contain-element.tsx
+++ b/src/matchers/to-contain-element.tsx
@@ -10,8 +10,10 @@ export function toContainElement(
   container: ReactTestInstance,
   element: ReactTestInstance | null
 ) {
-  if (element !== null || !this.isNot) {
-    checkHostElement(container, toContainElement, this);
+  checkHostElement(container, toContainElement, this);
+
+  if (element !== null) {
+    checkHostElement(element, toContainElement, this);
   }
 
   let matches: ReactTestInstance[] = [];

From a383a34bcd1c4e12a523b19ecba9c442fdaf7719 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 Sep 2023 11:27:45 +0200
Subject: [PATCH 10/12] refactor: code review changes

---
 .../__tests__/to-contain-element.test.tsx     | 62 ++++++++-----------
 src/matchers/to-contain-element.tsx           | 12 ++--
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/src/matchers/__tests__/to-contain-element.test.tsx b/src/matchers/__tests__/to-contain-element.test.tsx
index 7ef61e603..27e5be1ec 100644
--- a/src/matchers/__tests__/to-contain-element.test.tsx
+++ b/src/matchers/__tests__/to-contain-element.test.tsx
@@ -17,7 +17,7 @@ test('toContainElement() supports basic case', () => {
 
   expect(() => expect(parent).not.toContainElement(child))
     .toThrowErrorMatchingInlineSnapshot(`
-    "expect(element).not.toContainElement(element)
+    "expect(container).not.toContainElement(element)
 
       <View
         testID="parent"
@@ -44,10 +44,11 @@ test('toContainElement() supports negative case', () => {
   const view2 = screen.getByTestId('view2');
 
   expect(view1).not.toContainElement(view2);
+  expect(view2).not.toContainElement(view1);
 
   expect(() => expect(view1).toContainElement(view2))
     .toThrowErrorMatchingInlineSnapshot(`
-    "expect(element).toContainElement(element)
+    "expect(container).toContainElement(element)
 
       <View
         testID="view1"
@@ -62,7 +63,21 @@ test('toContainElement() supports negative case', () => {
   `);
 });
 
-test('toContainElement() passing null', () => {
+test('toContainElement() handles null container', () => {
+  render(<View testID="view" />);
+
+  const view = screen.getByTestId('view');
+
+  expect(() => expect(null).toContainElement(view))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "expect(received).toContainElement()
+
+    received value must be a host element.
+    Received has value: null"
+  `);
+});
+
+test('toContainElement() handles null element', () => {
   render(<View testID="view" />);
 
   const view = screen.getByTestId('view');
@@ -71,7 +86,7 @@ test('toContainElement() passing null', () => {
 
   expect(() => expect(view).toContainElement(null))
     .toThrowErrorMatchingInlineSnapshot(`
-    "expect(element).toContainElement(element)
+    "expect(container).toContainElement(element)
 
       <View
         testID="view"
@@ -84,32 +99,18 @@ test('toContainElement() passing null', () => {
   `);
 });
 
-test('toContainElement() on null elements', () => {
-  render(<View testID="view" />);
-
-  const view = screen.getByTestId('view');
-
-  expect(() => expect(null).toContainElement(view))
-    .toThrowErrorMatchingInlineSnapshot(`
-      "expect(received).toContainElement()
-
-      received value must be a host element.
-      Received has value: null"
-    `);
-});
-
-test('toContainElement() on non-React elements', () => {
+test('toContainElement() handles non-element container', () => {
   render(<View testID="view" />);
 
   const view = screen.getByTestId('view');
 
-  expect(() => expect({ name: 'Non-React element' }).not.toContainElement(view))
+  expect(() => expect({ name: 'non-element' }).not.toContainElement(view))
     .toThrowErrorMatchingInlineSnapshot(`
     "expect(received).not.toContainElement()
 
     received value must be a host element.
     Received has type:  object
-    Received has value: {"name": "Non-React element"}"
+    Received has value: {"name": "non-element"}"
   `);
 
   expect(() => expect(true).not.toContainElement(view))
@@ -122,30 +123,19 @@ test('toContainElement() on non-React elements', () => {
     `);
 });
 
-test('toContainElement() passing non-React element', () => {
+test('toContainElement() handles non-element element', () => {
   render(<View testID="view" />);
 
   const view = screen.getByTestId('view');
 
   expect(() =>
     // @ts-expect-error
-    expect(view).not.toContainElement(true)
+    expect(view).not.toContainElement({ name: 'non-element' })
   ).toThrowErrorMatchingInlineSnapshot(`
     "expect(received).not.toContainElement()
 
     received value must be a host element.
-    Received has type:  boolean
-    Received has value: true"
-  `);
-});
-
-test('toContainElement() passing null on non-React element', () => {
-  expect(() => expect(true).not.toContainElement(null))
-    .toThrowErrorMatchingInlineSnapshot(`
-    "expect(received).not.toContainElement()
-
-    received value must be a host element.
-    Received has type:  boolean
-    Received has value: true"
+    Received has type:  object
+    Received has value: {"name": "non-element"}"
   `);
 });
diff --git a/src/matchers/to-contain-element.tsx b/src/matchers/to-contain-element.tsx
index 07d07b7bb..952def0f2 100644
--- a/src/matchers/to-contain-element.tsx
+++ b/src/matchers/to-contain-element.tsx
@@ -1,8 +1,5 @@
 import { ReactTestInstance } from 'react-test-renderer';
-import {
-  matcherHint,
-  RECEIVED_COLOR as receivedColor,
-} from 'jest-matcher-utils';
+import { matcherHint, RECEIVED_COLOR } from 'jest-matcher-utils';
 import { checkHostElement, formatElement } from './utils';
 
 export function toContainElement(
@@ -17,22 +14,21 @@ export function toContainElement(
   }
 
   let matches: ReactTestInstance[] = [];
-
   if (element) {
     matches = container.findAll((node) => node === element);
   }
 
   return {
-    pass: Boolean(matches.length),
+    pass: matches.length > 0,
     message: () => {
       return [
         matcherHint(
           `${this.isNot ? '.not' : ''}.toContainElement`,
-          'element',
+          'container',
           'element'
         ),
         '',
-        receivedColor(`${formatElement(container)} ${
+        RECEIVED_COLOR(`${formatElement(container)} ${
           this.isNot ? '\n\ncontains:\n\n' : '\n\ndoes not contain:\n\n'
         } ${formatElement(element)}
         `),

From 7a3cf3e9ccc4ffdc24458d5d96b957d9fe257835 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 Sep 2023 11:30:03 +0200
Subject: [PATCH 11/12] refactor: tweaks

---
 src/matchers/extend-expect.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/matchers/extend-expect.d.ts b/src/matchers/extend-expect.d.ts
index 875a4fb50..2a9a595c0 100644
--- a/src/matchers/extend-expect.d.ts
+++ b/src/matchers/extend-expect.d.ts
@@ -1,5 +1,5 @@
 import type { StyleProp } from 'react-native';
-import { ReactTestInstance } from 'react-test-renderer';
+import type { ReactTestInstance } from 'react-test-renderer';
 import type { TextMatch, TextMatchOptions } from '../matches';
 import type { Style } from './to-have-style';
 

From 49ad4e1ce76eda2defe3d2da5d90f99b6bc9ce5b Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 Sep 2023 11:31:02 +0200
Subject: [PATCH 12/12] refactors: cleanup

---
 src/matchers/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/matchers/index.tsx b/src/matchers/index.tsx
index 8d9f52785..9b4db7f6c 100644
--- a/src/matchers/index.tsx
+++ b/src/matchers/index.tsx
@@ -1,13 +1,13 @@
-export { toBeOnTheScreen } from './to-be-on-the-screen';
+export { toBeBusy } from './to-be-busy';
 export { toBeChecked } from './to-be-checked';
 export { toBeDisabled, toBeEnabled } from './to-be-disabled';
-export { toBeBusy } from './to-be-busy';
 export { toBeEmptyElement } from './to-be-empty-element';
+export { toBeOnTheScreen } from './to-be-on-the-screen';
 export { toBePartiallyChecked } from './to-be-partially-checked';
+export { toBeSelected } from './to-be-selected';
 export { toBeVisible } from './to-be-visible';
+export { toContainElement } from './to-contain-element';
 export { toHaveDisplayValue } from './to-have-display-value';
 export { toHaveProp } from './to-have-prop';
 export { toHaveStyle } from './to-have-style';
 export { toHaveTextContent } from './to-have-text-content';
-export { toBeSelected } from './to-be-selected';
-export { toContainElement } from './to-contain-element';