refactor: cleanup

Author: mdjastrzebski

src/matchers/__tests__/to-be-on-the-screen.test.tsx

@@ -21,7 +21,7 @@ test('toBeOnTheScreen() on attached element', () => {
     .toThrowErrorMatchingInlineSnapshot(`
     "expect(element).not.toBeOnTheScreen()
 
-    expected element tree not to contain element but found:
+    expected element tree not to contain element, but found
       <View
         testID="test"
       />"
@@ -47,9 +47,10 @@ test('toBeOnTheScreen() on null element', () => {
   expect(null).not.toBeOnTheScreen();
   expect(() => expect(null).toBeOnTheScreen())
     .toThrowErrorMatchingInlineSnapshot(`
-    "expect(element).toBeOnTheScreen()
+    "expect(received).toBeOnTheScreen()
 
-    element could not be found in the element tree"
+    received value must be a host element.
+    Received has value: null"
   `);
 });
 

src/matchers/to-be-on-the-screen.tsx

@@ -1,20 +1,21 @@
 import type { ReactTestInstance } from 'react-test-renderer';
 import { matcherHint, RECEIVED_COLOR } from 'jest-matcher-utils';
-import { checkReactElement, printElement } from './utils';
+import { screen } from '../screen';
+import { checkHostElement, printElement } from './utils';
 
 export function toBeOnTheScreen(
   this: jest.MatcherContext,
   element: ReactTestInstance
 ) {
-  if (element !== null) {
-    checkReactElement(element, toBeOnTheScreen, this);
+  if (element !== null || !this.isNot) {
+    checkHostElement(element, toBeOnTheScreen, this);
   }
 
   const pass =
-    element === null ? false : getScreenRoot() === getRootElement(element);
+    element === null ? false : screen.UNSAFE_root === getRootElement(element);
 
   const errorFound = () => {
-    return `expected element tree not to contain element but found:\n${printElement(
+    return `expected element tree not to contain element, but found\n${printElement(
       element
     )}`;
   };
@@ -46,20 +47,3 @@ function getRootElement(element: ReactTestInstance) {
   }
   return root;
 }
-
-function getScreenRoot() {
-  try {
-    // eslint-disable-next-line import/no-extraneous-dependencies
-    const { screen } = require('@testing-library/react-native');
-    if (!screen) {
-      throw new Error('screen is undefined');
-    }
-
-    return screen.UNSAFE_root ?? screen.container;
-  } catch (error) {
-    throw new Error(
-      'Could not import `screen` object from @testing-library/react-native.\n\n' +
-        'Using toBeOnTheScreen() matcher requires @testing-library/react-native v10.1.0 or later to be added to your devDependencies.'
-    );
-  }
-}

src/matchers/utils.tsx

@@ -7,8 +7,9 @@ import {
 } from 'jest-matcher-utils';
 import prettyFormat, { plugins } from 'pretty-format';
 import redent from 'redent';
+import { isHostElement } from '../helpers/component-tree';
 
-class ReactElementTypeError extends Error {
+class HostElementTypeError extends Error {
   constructor(
     received: unknown,
     matcherFn: jest.CustomMatcher,
@@ -20,6 +21,7 @@ class ReactElementTypeError extends Error {
     if (Error.captureStackTrace) {
       Error.captureStackTrace(this, matcherFn);
     }
+
     let withType = '';
     try {
       withType = printWithType('Received', received, printReceived);
@@ -35,7 +37,7 @@ class ReactElementTypeError extends Error {
         ''
       ),
       '',
-      `${RECEIVED_COLOR('received')} value must be a React Element.`,
+      `${RECEIVED_COLOR('received')} value must be a host element.`,
       withType,
     ].join('\n');
   }
@@ -66,17 +68,12 @@ export function printElement(element: ReactTestInstance | null) {
   );
 }
 
-export function checkReactElement(
+export function checkHostElement(
   element: ReactTestInstance | null | undefined,
   matcherFn: jest.CustomMatcher,
   context: jest.MatcherContext
 ): asserts element is ReactTestInstance {
-  if (!element) {
-    throw new ReactElementTypeError(element, matcherFn, context);
-  }
-
-  // @ts-expect-error internal _fiber property of ReactTestInstance
-  if (!element._fiber && !VALID_ELEMENTS.includes(element.type.toString())) {
-    throw new ReactElementTypeError(element, matcherFn, context);
+  if (!isHostElement(element)) {
+    throw new HostElementTypeError(element, matcherFn, context);
   }
 }