test fixes

Author: walker-sean

src/frontend/src/app/AppContextUser.tsx

@@ -9,7 +9,7 @@ import { createContext } from 'react';
 import { AuthenticatedUser } from 'shared';
 import LoadingIndicator from '../components/LoadingIndicator';
 import { useAuth } from '../hooks/auth.hooks';
-import { useClarity } from './ClarityProvider';
+import { useClarity } from '../hooks/misc.hooks';
 import { fullNamePipe } from '../utils/pipes';
 import { useGetUsersTeams } from '../hooks/teams.hooks';
 import ErrorPage from '../pages/ErrorPage';

src/frontend/src/app/ClarityProvider.tsx

@@ -9,24 +9,10 @@ declare global {
 
 const CLARITY_PROJECT_ID = import.meta.env.VITE_REACT_APP_CLARITY_PROJECT_ID as string | undefined;
 
-type ClarityFn = (...args: any[]) => void;
+export type ClarityFn = (...args: any[]) => void;
 
 export const ClarityContext = createContext<ClarityFn | undefined>(undefined);
 
-/**
- * useClarity hook
- *
- * Returns the Clarity function from context. Use this to call Clarity API methods.
- * Example: const clarity = useClarity();
- */
-export const useClarity = () => {
-  const context = useContext(ClarityContext);
-  if (context === undefined) {
-    throw new Error('useClarity must be used within a ClarityProvider');
-  }
-  return context;
-};
-
 /**
  * ClarityProvider component
  *

src/frontend/src/hooks/misc.hooks.ts

@@ -7,7 +7,8 @@ import { useQuery } from 'react-query';
 import { VersionObject } from '../utils/types';
 import { getReleaseInfo } from '../apis/misc.api';
 import { useHistory } from 'react-router-dom';
-import { useState } from 'react';
+import { useContext, useState } from 'react';
+import { ClarityContext } from '../app/ClarityProvider';
 
 export const useGetVersionNumber = () => {
   return useQuery<VersionObject, Error>(['version'], async () => {
@@ -34,3 +35,17 @@ export const useHistoryState = <T>(key: string, initialValue: T): [T, (t: T) =>
   }
   return [rawState, setState];
 };
+
+/**
+ * useClarity hook
+ *
+ * Returns the Clarity function from context. Use this to call Clarity API methods.
+ * Example: const clarity = useClarity();
+ */
+export const useClarity = () => {
+  const context = useContext(ClarityContext);
+  if (context === undefined) {
+    throw new Error('useClarity must be used within a ClarityProvider');
+  }
+  return context;
+};

src/frontend/src/tests/pages/ChangeRequestDetailPage/ChangeRequestDetailsView.test.tsx

@@ -48,20 +48,16 @@ const mockUseLogUserInHook = (isLoading: boolean, isError: boolean, error?: Erro
 const renderComponent = (cr: ChangeRequest, allowed: boolean = false) => {
   const RouterWrapper = routerWrapperBuilder({});
   return render(
-    <ClarityProvider>
-      <AppContextUser>
-        <ToastProvider>
-          <RouterWrapper>
-            <ChangeRequestDetailsView
-              changeRequest={cr}
-              isUserAllowedToReview={allowed}
-              isUserAllowedToImplement={allowed}
-              isUserAllowedToDelete={allowed}
-            />
-          </RouterWrapper>
-        </ToastProvider>
-      </AppContextUser>
-    </ClarityProvider>
+    <ToastProvider>
+      <RouterWrapper>
+        <ChangeRequestDetailsView
+          changeRequest={cr}
+          isUserAllowedToReview={allowed}
+          isUserAllowedToImplement={allowed}
+          isUserAllowedToDelete={allowed}
+        />
+      </RouterWrapper>
+    </ToastProvider>
   );
 };
 

src/frontend/src/tests/pages/CreateChangeRequestPage/CreateProposedSolutionsList.test.tsx

@@ -8,23 +8,17 @@ import CreateProposedSolutionsList from '../../../pages/CreateChangeRequestPage/
 import * as authHooks from '../../../hooks/auth.hooks';
 import { mockAuth } from '../../test-support/test-data/test-utils.stub';
 import * as userHooks from '../../../hooks/users.hooks';
-import AppContextUser from '../../../app/AppContextUser';
 import { exampleAuthenticatedAdminUser } from '../../test-support/test-data/authenticated-user.stub';
-import ClarityProvider from '../../../app/ClarityProvider';
 
 /**
  * Sets up the component under test with the desired values and renders it.
  */
 const renderComponent = () => {
   const RouterWrapper = routerWrapperBuilder({});
   return render(
-    <ClarityProvider>
-      <AppContextUser>
-        <RouterWrapper>
-          <CreateProposedSolutionsList proposedSolutions={[]} setProposedSolutions={() => {}} />
-        </RouterWrapper>
-      </AppContextUser>
-    </ClarityProvider>
+    <RouterWrapper>
+      <CreateProposedSolutionsList proposedSolutions={[]} setProposedSolutions={() => {}} />
+    </RouterWrapper>
   );
 };
 

src/frontend/src/tests/pages/WorkPackageDetailPage/WorkPackagePage.test.tsx

@@ -13,13 +13,11 @@ import { mockAuth, mockUseQueryResult } from '../../test-support/test-data/test-
 import { exampleDesignWorkPackage, exampleResearchWorkPackage } from '../../test-support/test-data/work-packages.stub';
 import { exampleWbsProject1 } from '../../test-support/test-data/wbs-numbers.stub';
 import WorkPackagePage from '../../../pages/WorkPackageDetailPage/WorkPackagePage';
-import AppContextUser from '../../../app/AppContextUser';
 import { useCurrentUser } from '../../../hooks/users.hooks';
 import {
   exampleAuthenticatedAdminUser,
   exampleAuthenticatedGuestUser
 } from '../../test-support/test-data/authenticated-user.stub';
-import ClarityProvider from '../../../app/ClarityProvider';
 
 vi.mock('../../../hooks/work-packages.hooks');
 
@@ -55,11 +53,7 @@ const renderComponent = () => {
   const RouterWrapper = routerWrapperBuilder({});
   return render(
     <RouterWrapper>
-      <ClarityProvider>
-        <AppContextUser>
-          <WorkPackagePage wbsNum={exampleWbsProject1} />
-        </AppContextUser>
-      </ClarityProvider>
+      <WorkPackagePage wbsNum={exampleWbsProject1} />
     </RouterWrapper>
   );
 };