Update: CR comments

Author: kdquistanchala

packages/native/src/lib/ElementAssertion.ts

@@ -2,17 +2,15 @@ import { Assertion, AssertionError } from "@assertive-ts/core";
 import { get } from "dot-prop-immutable";
 import { ReactTestInstance } from "react-test-renderer";
 
+import { instanceToString } from "./helpers/helpers";
+
 export class ElementAssertion extends Assertion<ReactTestInstance> {
   public constructor(actual: ReactTestInstance) {
     super(actual);
   }
 
   public override toString = (): string => {
-    if (this.actual === null) {
-      return "null";
-    }
-
-    return `<${this.actual.type.toString()} ... />`;
+    return instanceToString(this.actual);
   };
 
   /**
@@ -32,7 +30,7 @@ export class ElementAssertion extends Assertion<ReactTestInstance> {
     });
     const invertedError = new AssertionError({
       actual: this.actual,
-      message: `Expected element ${this.toString()} to NOT be disabled.`,
+      message: `Expected element ${this.toString()} NOT to be disabled.`,
     });
 
     return this.execute({
@@ -58,7 +56,7 @@ export class ElementAssertion extends Assertion<ReactTestInstance> {
     });
     const invertedError = new AssertionError({
       actual: this.actual,
-      message: `Expected element ${this.toString()} to NOT be enabled.`,
+      message: `Expected element ${this.toString()} NOT to be enabled.`,
     });
 
     return this.execute({

packages/native/src/lib/ToBeEmptyElementAssertion.ts renamed to packages/native/src/lib/ToBeEmptyAssertion.ts

@@ -1,42 +1,38 @@
 import { Assertion, AssertionError } from "@assertive-ts/core";
 import { ReactTestInstance } from "react-test-renderer";
 
-import { isEmpty } from "./helpers/helpers";
+import { instanceToString, isEmpty } from "./helpers/helpers";
 
 /**
  * Assertion for checking if a React element is empty.
  */
-export class ToBeEmptyElementAssertion extends Assertion<ReactTestInstance> {
+export class ToBeEmptyAssertion extends Assertion<ReactTestInstance> {
   public constructor(actual: ReactTestInstance) {
     super(actual);
   }
 
   public override toString = (): string => {
-    if (this.actual === null) {
-      return "null";
-    }
-
-    return `<${this.actual.type.toString()} ... />`;
+    return instanceToString(this.actual);
   };
 
   /**
    * Check if the element is empty.
    *
    * @example
    * ```
-   * expect(element).toBeEmptyElement();
+   * expect(element).toBeEmpty();
    * ```
    *
    * @returns the assertion instance
    */
-  public toBeEmptyElement(): this {
+  public toBeEmpty(): this {
     const error = new AssertionError({
       actual: this.actual,
       message: `Expected element ${this.toString()} to be empty.`,
     });
     const invertedError = new AssertionError({
       actual: this.actual,
-      message: `Expected element ${this.toString()} to NOT be empty.`,
+      message: `Expected element ${this.toString()} NOT to be empty.`,
     });
 
     return this.execute({

packages/native/src/lib/helpers/helpers.ts

@@ -1,3 +1,5 @@
+import { ReactTestInstance } from "react-test-renderer";
+
 /**
  * Checks if a value is empty.
  *
@@ -15,3 +17,17 @@ export function isEmpty(value: unknown): boolean {
 
   return false;
 }
+
+/**
+ * Converts a ReactTestInstance to a string representation.
+ *
+ * @param instance - The ReactTestInstance to convert.
+ * @returns A string representation of the instance.
+ */
+export function instanceToString(instance: ReactTestInstance | null): string {
+  if (instance === null) {
+    return "null";
+  }
+
+  return `<${instance.type.toString()} ... />`;
+}

packages/native/test/lib/ElementAssertion.test.tsx

@@ -34,7 +34,7 @@ describe("[Unit] ElementAssertion.test.ts", () => {
             .toHaveMessage("Expected element <TextInput ... /> to be disabled.");
           expect(() => test.not.toBeEnabled())
             .toThrowError(AssertionError)
-            .toHaveMessage("Expected element <TextInput ... /> to NOT be enabled.");
+            .toHaveMessage("Expected element <TextInput ... /> NOT to be enabled.");
         });
       });
     });
@@ -59,7 +59,7 @@ describe("[Unit] ElementAssertion.test.ts", () => {
             .toHaveMessage("Expected element <View ... /> to be enabled.");
           expect(() => parent.not.toBeDisabled())
             .toThrowError(AssertionError)
-            .toHaveMessage("Expected element <View ... /> to NOT be disabled.");
+            .toHaveMessage("Expected element <View ... /> NOT to be disabled.");
         });
       });
 
@@ -83,13 +83,13 @@ describe("[Unit] ElementAssertion.test.ts", () => {
             .toHaveMessage("Expected element <View ... /> to be disabled.");
           expect(() => parent.not.toBeEnabled())
             .toThrowError(AssertionError)
-            .toHaveMessage("Expected element <View ... /> to NOT be enabled.");
+            .toHaveMessage("Expected element <View ... /> NOT to be enabled.");
           expect(() => child.toBeDisabled())
             .toThrowError(AssertionError)
             .toHaveMessage("Expected element <View ... /> to be disabled.");
           expect(() => child.not.toBeEnabled())
             .toThrowError(AssertionError)
-            .toHaveMessage("Expected element <View ... /> to NOT be enabled.");
+            .toHaveMessage("Expected element <View ... /> NOT to be enabled.");
         });
       });
     });
@@ -114,7 +114,7 @@ describe("[Unit] ElementAssertion.test.ts", () => {
             .toHaveMessage("Expected element <View ... /> to be enabled.");
           expect(() => child.not.toBeDisabled())
             .toThrowError(AssertionError)
-            .toHaveMessage("Expected element <View ... /> to NOT be disabled.");
+            .toHaveMessage("Expected element <View ... /> NOT to be disabled.");
         });
 
         it("returns error for parent element", () => {
@@ -124,7 +124,7 @@ describe("[Unit] ElementAssertion.test.ts", () => {
             .toHaveMessage("Expected element <View ... /> to be disabled.");
           expect(() => parent.not.toBeEnabled())
             .toThrowError(AssertionError)
-            .toHaveMessage("Expected element <View ... /> to NOT be enabled.");
+            .toHaveMessage("Expected element <View ... /> NOT to be enabled.");
         });
       });
     });

packages/native/test/lib/ToBeEmptyElementAssertion.test.tsx

@@ -2,19 +2,19 @@ import { AssertionError, expect } from "@assertive-ts/core";
 import { render } from "@testing-library/react-native";
 import { View, Text } from "react-native";
 
-import { ToBeEmptyElementAssertion } from "../../src/lib/ToBeEmptyElementAssertion";
+import { ToBeEmptyAssertion } from "../../src/lib/ToBeEmptyAssertion";
 
-describe("[Unit] ToBeEmptyElementAssertion.test.ts", () => {
-  describe(".toBeEmptyElement", () => {
+describe("[Unit] toBeEmptyAssertion.test.ts", () => {
+  describe(".toBeEmpty", () => {
     context("when the element is empty", () => {
       it("returns the assertion instance", () => {
         const element = render(<View testID="id" />);
-        const test = new ToBeEmptyElementAssertion(element.getByTestId("id"));
+        const test = new ToBeEmptyAssertion(element.getByTestId("id"));
 
-        expect(test.toBeEmptyElement()).toBe(test);
-        expect(() => test.not.toBeEmptyElement())
+        expect(test.toBeEmpty()).toBe(test);
+        expect(() => test.not.toBeEmpty())
           .toThrowError(AssertionError)
-          .toHaveMessage("Expected element <View ... /> to NOT be empty.");
+          .toHaveMessage("Expected element <View ... /> NOT to be empty.");
       });
     });
 
@@ -25,10 +25,10 @@ describe("[Unit] ToBeEmptyElementAssertion.test.ts", () => {
             <Text>{"Not empty"}</Text>
           </View>,
         );
-        const test = new ToBeEmptyElementAssertion(element.getByTestId("id"));
+        const test = new ToBeEmptyAssertion(element.getByTestId("id"));
 
-        expect(test.not.toBeEmptyElement()).toBeEqual(test);
-        expect(() => test.toBeEmptyElement())
+        expect(test.not.toBeEmpty()).toBeEqual(test);
+        expect(() => test.toBeEmpty())
           .toThrowError(AssertionError)
           .toHaveMessage("Expected element <View ... /> to be empty.");
       });