fix: nits on the code and tests

Author: ChrisChV

src/library-authoring/data/apiHooks.ts

@@ -1030,7 +1030,7 @@ export const useMigrationInfo = (sourcesKeys: string[], enabled: boolean = true)
 /**
  * Returns the draft history of a library block.
  */
-export const useLibraryBlockDraftHistory = (usageKey: string | undefined) => (
+export const useLibraryBlockDraftHistory = (usageKey?: string) => (
   useQuery({
     queryKey: xblockQueryKeys.draftHistory(usageKey!),
     queryFn: usageKey ? () => api.getLibraryBlockDraftHistory(usageKey) : skipToken,
@@ -1040,7 +1040,7 @@ export const useLibraryBlockDraftHistory = (usageKey: string | undefined) => (
 /**
  * Returns the publish history of a library block.
  */
-export const useLibraryBlockPublishHistory = (usageKey: string | undefined) => (
+export const useLibraryBlockPublishHistory = (usageKey?: string) => (
   useQuery({
     queryKey: xblockQueryKeys.publishHistory(usageKey!),
     queryFn: usageKey ? () => api.getLibraryBlockPublishHistory(usageKey) : skipToken,
@@ -1051,8 +1051,8 @@ export const useLibraryBlockPublishHistory = (usageKey: string | undefined) => (
  * Returns the entries for a publish history group of a library block.
  */
 export const useLibraryBlockPublishHistoryEntries = (
-  usageKey: string | undefined,
-  publishGroupId: string | undefined,
+  usageKey?: string,
+  publishGroupId?: string,
   enabled: boolean = true,
 ) => (
   useQuery({
@@ -1064,7 +1064,7 @@ export const useLibraryBlockPublishHistoryEntries = (
 /**
  * Returns the creation entry for a library block.
  */
-export const useLibraryBlockCreationEntry = (usageKey: string | undefined) => (
+export const useLibraryBlockCreationEntry = (usageKey?: string ) => (
   useQuery({
     queryKey: xblockQueryKeys.creationEntry(usageKey!),
     queryFn: usageKey ? () => api.getLibraryBlockCreationEntry(usageKey) : skipToken,

src/library-authoring/generic/history-log/HistoryLog.test.tsx

@@ -1,17 +1,18 @@
+import { userEvent } from '@testing-library/user-event';
 import {
   initializeMocks,
   render,
   screen,
   waitFor,
-  fireEvent,
+  findByDeepTextContent,
 } from '@src/testUtils';
 
 import {
   mockLibraryBlockDraftHistory,
   mockLibraryBlockPublishHistory,
   mockLibraryBlockPublishHistoryEntries,
   mockLibraryBlockCreationEntry,
-} from '../../data/api.mocks';
+} from '@src/library-authoring/data/api.mocks';
 import { HistoryComponentLog } from './HistoryLog';
 
 mockLibraryBlockDraftHistory.applyMock();
@@ -23,19 +24,6 @@ const renderComponent = (componentId: string) => render(
   <HistoryComponentLog componentId={componentId} displayName="Test Component" />,
 );
 
-/**
- * Finds the innermost element whose full textContent (normalized whitespace) matches the given regex.
- * Useful when text is split across child elements (e.g. by an icon).
- * Requiring that no direct child also matches ensures we get the deepest matching element.
- */
-const findByTextContent = (pattern: RegExp) => screen.findByText((_, el) => {
-  if (!el) return false;
-  const normalizedText = (el.textContent ?? '').replace(/\s+/g, ' ').trim();
-  if (!pattern.test(normalizedText)) return false;
-  return !Array.from(el.children).some(
-    (child) => pattern.test((child.textContent ?? '').replace(/\s+/g, ' ').trim()),
-  );
-});
 
 describe('<HistoryComponentLog />', () => {
   beforeEach(() => {
@@ -48,12 +36,13 @@ describe('<HistoryComponentLog />', () => {
   });
 
   it('renders draft history group with entries when they exist', async () => {
+    const user = userEvent.setup();
     renderComponent(mockLibraryBlockCreationEntry.usageKey);
-    const trigger = await findByTextContent(/Test Component is a draft/i);
+    const trigger = await findByDeepTextContent(/Test Component is a draft/i);
     expect(trigger).toBeInTheDocument();
-    fireEvent.click(trigger);
-    expect(await findByTextContent(/test_user_1 edited.*Electron Arcs/i)).toBeInTheDocument();
-    expect(await findByTextContent(/test_user_2 renamed.*More on Quarks/i)).toBeInTheDocument();
+    await user.click(trigger);
+    expect(await findByDeepTextContent(/test_user_1 edited.*Electron Arcs/i)).toBeInTheDocument();
+    expect(await findByDeepTextContent(/test_user_2 renamed.*More on Quarks/i)).toBeInTheDocument();
   });
 
   it('does not render draft history group when there are no draft entries', async () => {
@@ -64,17 +53,18 @@ describe('<HistoryComponentLog />', () => {
 
   it('renders publish history group when one exists', async () => {
     renderComponent(mockLibraryBlockCreationEntry.usageKey);
-    expect(await findByTextContent(/author published.*Protons/i)).toBeInTheDocument();
+    expect(await findByDeepTextContent(/author published.*Protons/i)).toBeInTheDocument();
     expect(await screen.findByText(/5 authors contributed/i)).toBeInTheDocument();
   });
 
   it('loads and shows publish history entries after expanding the publish group', async () => {
+    const user = userEvent.setup();
     renderComponent(mockLibraryBlockCreationEntry.usageKey);
     expect(await screen.findByText(/5 authors contributed/i)).toBeInTheDocument();
-    const publishTrigger = await findByTextContent(/author published.*Protons/i);
+    const publishTrigger = await findByDeepTextContent(/author published.*Protons/i);
 
-    fireEvent.click(publishTrigger);
-    expect(await findByTextContent(/test_user edited.*Protons/i)).toBeInTheDocument();
+    await user.click(publishTrigger);
+    expect(await findByDeepTextContent(/test_user edited.*Protons/i)).toBeInTheDocument();
     await waitFor(() => expect(screen.queryByText(/5 authors contributed/i)).not.toBeInTheDocument());
   });
 
@@ -86,6 +76,6 @@ describe('<HistoryComponentLog />', () => {
 
   it('always renders the created group with fallback user when createdBy is null', async () => {
     renderComponent(mockLibraryBlockCreationEntry.usageKey);
-    expect(await findByTextContent(/Author created.*Introduction to Testing 1/i)).toBeInTheDocument();
+    expect(await findByDeepTextContent(/Author created.*Introduction to Testing 1/i)).toBeInTheDocument();
   });
 });

src/testUtils.tsx

@@ -13,7 +13,7 @@ import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { AppProvider } from '@edx/frontend-platform/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { render, type RenderResult } from '@testing-library/react';
+import { render, screen, type RenderResult } from '@testing-library/react';
 import MockAdapter from 'axios-mock-adapter';
 import {
   generatePath,
@@ -245,9 +245,36 @@ const getInnerText = (element: Element | null): string => {
     .join(' ');
 };
 
+/**
+ * Returns a matcher for `getByText`/`findByText` that checks exact text match and element type.
+ * - Requires specifying the element's nodeName (e.g. 'P', 'DIV').
+ * - Uses exact string comparison (no regex).
+ *
+ * For partial/regex matching when text is split across child elements,
+ * use `findByDeepTextContent` instead.
+ */
 export const matchInnerText = (
   nodeName: string,
   textToMatch: string,
 ) => (_: string, element: Element | null) => !!element
     && element.nodeName === nodeName
     && getInnerText(element) === textToMatch;
+
+/**
+ * Finds the innermost element whose full textContent (normalized whitespace) matches a regex.
+ * Unlike `matchInnerText`, this:
+ * - Accepts a `RegExp` for partial/pattern matching.
+ * - Does NOT require specifying the element type.
+ * - Normalizes whitespace (collapses multiple spaces/newlines into one).
+ * - Returns the deepest matching element (excludes elements where a direct child also matches).
+ *
+ * Useful when text is split across child elements (e.g. by an icon or inline tag).
+ */
+export const findByDeepTextContent = (pattern: RegExp) => screen.findByText((_, el) => {
+  if (!el) return false;
+  const normalizedText = (el.textContent ?? '').replace(/\s+/g, ' ').trim();
+  if (!pattern.test(normalizedText)) return false;
+  return !Array.from(el.children).some(
+    (child) => pattern.test(((child as Element).textContent ?? '').replace(/\s+/g, ' ').trim()),
+  );
+});