test: fix some failing tests

Author: navinkarkera

src/course-unit/CourseUnit.test.tsx

@@ -79,7 +79,7 @@ import messages from './messages';
 let axiosMock;
 let store;
 const courseId = '123';
-const blockId = '567890';
+const blockId = 'block-v1:edX+DemoX+Demo_Course+type@vertical+block@123';
 const sequenceId = 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5';
 const unitDisplayName = courseSectionVerticalMock.xblock_info.display_name;
 const mockedUsedNavigate = jest.fn();
@@ -102,8 +102,8 @@ const postXBlockBody = {
   staged_content: 'clipboard',
 };
 
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
+jest.mock('react-router', () => ({
+  ...jest.requireActual('react-router'),
   useParams: () => ({ blockId, sequenceId }),
   useNavigate: () => mockedUsedNavigate,
 }));
@@ -376,19 +376,17 @@ describe('<CourseUnit />', () => {
     await user.click(publishBtn);
 
     // check if the sidebar status is Published and Live
-    waitFor(() => {
-      expect(screen.getByText(
-        legacySidebarMessages.sidebarTitlePublishedAndLive.defaultMessage,
-      )).toBeInTheDocument();
-    });
+    expect(await screen.findByText(
+      legacySidebarMessages.sidebarTitlePublishedAndLive.defaultMessage,
+    )).toBeInTheDocument();
     expect(await screen.findByText(
       unitInfoMessages.publishLastPublished.defaultMessage
         .replace('{publishedOn}', courseSectionVerticalMock.xblock_info.published_on)
         .replace('{publishedBy}', userName),
     )).toBeInTheDocument();
-    waitFor(() => {
-      expect(screen.queryByRole('button', { name: legacySidebarMessages.actionButtonPublishTitle.defaultMessage })).not.toBeInTheDocument();
-    });
+    expect(screen.queryByRole('button', {
+      name: legacySidebarMessages.actionButtonPublishTitle.defaultMessage,
+    })).not.toBeInTheDocument();
     expect(await screen.findByText(unitDisplayName)).toBeInTheDocument();
 
     axiosMock
@@ -572,11 +570,9 @@ describe('<CourseUnit />', () => {
     );
 
     // after duplicate the xblock, the sidebar status changes to Draft (unpublished changes)
-    await waitFor(async () => {
-      expect(await screen.findByText(
-        legacySidebarMessages.sidebarTitleDraftUnpublishedChanges.defaultMessage,
-      )).toBeInTheDocument();
-    });
+    expect(await screen.findByText(
+      legacySidebarMessages.sidebarTitleDraftUnpublishedChanges.defaultMessage,
+    )).toBeInTheDocument();
     expect(await screen.findByText(legacySidebarMessages.releaseStatusTitle.defaultMessage)).toBeInTheDocument();
     expect(await screen.findByText(unitInfoMessages.visibilityVisibleToTitle.defaultMessage)).toBeInTheDocument();
     expect(await screen.findByText(unitInfoMessages.visibilityCheckboxTitle.defaultMessage)).toBeInTheDocument();

src/course-unit/legacy-sidebar/index.tsx

@@ -39,6 +39,10 @@ const LegacySidebar = ({
   const { blockId } = useParams();
   const { courseId } = useCourseAuthoringContext();
 
+  if (!blockId) {
+    return null;
+  }
+
   return (
     <Stack gap={3} className="px-4 mw-sm">
       {isUnitVerticalType && (

src/course-unit/unit-sidebar/unit-info/PublishControls.tsx

@@ -14,7 +14,7 @@ import messages from './messages';
 import UnitVisibilityInfo from './UnitVisibilityInfo';
 
 interface PublishControlsProps {
-  blockId?: string,
+  blockId: string,
   hideCopyButton?: boolean,
 }
 
@@ -48,42 +48,36 @@ const PublishControls = ({
 
   const handleCourseUnitVisibility = () => {
     closeVisibleModal();
-    if (blockId) {
-      publishMutation.mutate({
-        unitId: blockId,
-        type: PUBLISH_TYPES.republish,
-        isVisibleToStaffOnly: false,
-        groupAccess: null,
-      });
-    }
+    publishMutation.mutate({
+      unitId: blockId,
+      type: PUBLISH_TYPES.republish,
+      isVisibleToStaffOnly: false,
+      groupAccess: null,
+    });
   };
 
   const handleCourseUnitDiscardChanges = () => {
     closeDiscardModal();
-    if (blockId) {
-      publishMutation.mutate(
-        {
-          unitId: blockId,
-          type: PUBLISH_TYPES.discardChanges,
-          isVisibleToStaffOnly: false,
-          groupAccess: null,
-        },
-        {
-          onSuccess: () => sendMessageToIframe(messageTypes.refreshXBlock, null),
-        },
-      );
-    }
-  };
-
-  const handleCourseUnitPublish = () => {
-    if (blockId) {
-      publishMutation.mutate({
+    publishMutation.mutate(
+      {
         unitId: blockId,
-        type: PUBLISH_TYPES.makePublic,
+        type: PUBLISH_TYPES.discardChanges,
         isVisibleToStaffOnly: false,
         groupAccess: null,
-      });
-    }
+      },
+      {
+        onSuccess: () => sendMessageToIframe(messageTypes.refreshXBlock, null),
+      },
+    );
+  };
+
+  const handleCourseUnitPublish = () => {
+    publishMutation.mutate({
+      unitId: blockId,
+      type: PUBLISH_TYPES.makePublic,
+      isVisibleToStaffOnly: false,
+      groupAccess: null,
+    });
   };
 
   return (