refactor: pre-merge tweaks

Author: mdjastrzebski

src/__tests__/config.test.ts

@@ -23,7 +23,6 @@ test('resetToDefaults() resets config to defaults', () => {
   configure({
     asyncUtilTimeout: 5000,
     defaultIncludeHiddenElements: false,
-    defaultHidden: false,
   });
   expect(getConfig().asyncUtilTimeout).toEqual(5000);
   expect(getConfig().defaultIncludeHiddenElements).toEqual(false);
@@ -35,6 +34,7 @@ test('resetToDefaults() resets config to defaults', () => {
 
 test('configure handles alias option defaultHidden', () => {
   expect(getConfig().defaultIncludeHiddenElements).toEqual(true);
+
   configure({ defaultHidden: false });
   expect(getConfig().defaultIncludeHiddenElements).toEqual(false);
 });

src/config.ts

@@ -4,18 +4,15 @@ export type Config = {
   /** Default timeout, in ms, for `waitFor` and `findBy*` queries. */
   asyncUtilTimeout: number;
 
-  /** Default includeHiddenElements value for all queries */
+  /** Default value for `includeHiddenElements` query option. */
   defaultIncludeHiddenElements: boolean;
 
   /** Default options for `debug` helper. */
   defaultDebugOptions?: Partial<DebugOptions>;
 };
 
 export type ConfigAliasOptions = {
-  /** Default hidden value for all queries, alias to defaultIncludeHiddenElements to respect react-testing-library API
-   * WARNING: if both defaultHidden and defaultIncludeHiddenElements values are defined,
-   * then defaultIncludeHiddenElements will take precedence
-   */
+  /** RTL-compatibility alias to `defaultIncludeHiddenElements` */
   defaultHidden: boolean;
 };
 
@@ -34,14 +31,10 @@ export function configure(options: Partial<Config & ConfigAliasOptions>) {
     defaultHidden ??
     config.defaultIncludeHiddenElements;
 
-  const optionsToSet = {
-    ...restOptions,
-    defaultIncludeHiddenElements,
-  };
-
   config = {
     ...config,
-    ...optionsToSet,
+    ...restOptions,
+    defaultIncludeHiddenElements,
   };
 }
 

src/helpers/__tests__/includeHiddenElements.test.tsx

@@ -1,9 +1,6 @@
-import { View } from 'react-native';
 import React from 'react';
-
-import render from '../../render';
-import { screen } from '../../screen';
-import { configure } from '../../config';
+import { View } from 'react-native';
+import { configure, render, screen } from '../..';
 
 test('includeHiddenElements query option takes priority over hidden option and global config', () => {
   configure({ defaultHidden: true, defaultIncludeHiddenElements: true });

src/helpers/findAll.ts

@@ -15,12 +15,12 @@ export function findAll(
 ) {
   const results = root.findAll(predicate);
 
-  const hidden =
+  const includeHiddenElements =
     options?.includeHiddenElements ??
     options?.hidden ??
     getConfig()?.defaultIncludeHiddenElements;
 
-  if (hidden) {
+  if (includeHiddenElements) {
     return results;
   }
 

src/queries/__tests__/a11yState.test.tsx

@@ -247,5 +247,7 @@ test('byA11yState queries support hidden option', () => {
   ).toBeFalsy();
   expect(() =>
     getByA11yState({ expanded: false }, { includeHiddenElements: false })
-  ).toThrow();
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"Unable to find an element with expanded state: false"`
+  );
 });

src/queries/__tests__/a11yValue.test.tsx

@@ -110,5 +110,7 @@ test('byA11yValue queries support hidden option', () => {
   ).toBeFalsy();
   expect(() =>
     getByA11yValue({ max: 10 }, { includeHiddenElements: false })
-  ).toThrow();
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"Unable to find an element with accessibilityValue: {"max":10}"`
+  );
 });

src/queries/__tests__/displayValue.test.tsx

@@ -115,5 +115,7 @@ test('byDisplayValue queries support hidden option', () => {
   ).toBeFalsy();
   expect(() =>
     getByDisplayValue('hidden', { includeHiddenElements: false })
-  ).toThrow();
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"Unable to find an element with displayValue: hidden"`
+  );
 });

src/queries/__tests__/hintText.test.tsx

@@ -122,5 +122,7 @@ test('byHintText queries support hidden option', () => {
   ).toBeFalsy();
   expect(() =>
     getByHintText('hidden', { includeHiddenElements: false })
-  ).toThrow();
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"Unable to find an element with accessibilityHint: hidden"`
+  );
 });

src/queries/__tests__/labelText.test.tsx

@@ -161,5 +161,7 @@ test('byLabelText queries support hidden option', () => {
   ).toBeFalsy();
   expect(() =>
     getByLabelText('hidden', { includeHiddenElements: false })
-  ).toThrow();
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"Unable to find an element with accessibilityLabel: hidden"`
+  );
 });

src/queries/__tests__/placeholderText.test.tsx

@@ -74,5 +74,7 @@ test('byPlaceholderText queries support hidden option', () => {
   ).toBeFalsy();
   expect(() =>
     getByPlaceholderText('hidden', { includeHiddenElements: false })
-  ).toThrow();
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"Unable to find an element with placeholder: hidden"`
+  );
 });