chore: fix merge conflicts

src/library-authoring/LibraryAuthoringPage.test.tsx

@@ -10,13 +10,9 @@ import {
 import { getContentSearchConfigUrl } from '../search-manager/data/api';
 import mockResult from './__mocks__/library-search.json';
 import mockEmptyResult from '../search-modal/__mocks__/empty-search-result.json';
-import {
-  getContentLibraryApiUrl,
-  getLibraryCollectionsApiUrl,
-  getXBlockFieldsApiUrl,
-  type ContentLibrary,
-} from './data/api';
+import { mockContentLibrary, mockLibraryBlockTypes, mockXBlockFields } from './data/api.mocks';
 import { LibraryLayout } from '.';
+import { getLibraryCollectionsApiUrl } from './data/api';
 
 mockContentLibrary.applyMock();
 mockLibraryBlockTypes.applyMock();
@@ -525,16 +521,17 @@ describe('<LibraryAuthoringPage />', () => {
   });
 
   it('should create a collection', async () => {
+    await renderLibraryPage();
     const title = 'This is a Test';
     const description = 'This is the description of the Test';
-    const url = getLibraryCollectionsApiUrl(libraryData.id);
+    const url = getLibraryCollectionsApiUrl(mockContentLibrary.libraryId);
+    const { axiosMock } = initializeMocks();
     axiosMock.onPost(url).reply(200, {
       id: '1',
       slug: 'this-is-a-test',
       title,
       description,
     });
-    await renderLibraryPage();
 
     expect(await screen.findByRole('heading')).toBeInTheDocument();
     expect(screen.queryByText(/add content/i)).not.toBeInTheDocument();
@@ -567,16 +564,18 @@ describe('<LibraryAuthoringPage />', () => {
   });
 
   it('should show validations in create collection', async () => {
+    await renderLibraryPage();
+
     const title = 'This is a Test';
     const description = 'This is the description of the Test';
-    const url = getLibraryCollectionsApiUrl(libraryData.id);
+    const url = getLibraryCollectionsApiUrl(mockContentLibrary.libraryId);
+    const { axiosMock } = initializeMocks();
     axiosMock.onPost(url).reply(200, {
       id: '1',
       slug: 'this-is-a-test',
       title,
       description,
     });
-    await renderLibraryPage();
 
     expect(await screen.findByRole('heading')).toBeInTheDocument();
     expect(screen.queryByText(/add content/i)).not.toBeInTheDocument();
@@ -600,11 +599,12 @@ describe('<LibraryAuthoringPage />', () => {
   });
 
   it('should show error on create collection', async () => {
+    await renderLibraryPage();
     const title = 'This is a Test';
     const description = 'This is the description of the Test';
-    const url = getLibraryCollectionsApiUrl(libraryData.id);
+    const url = getLibraryCollectionsApiUrl(mockContentLibrary.libraryId);
+    const { axiosMock } = initializeMocks();
     axiosMock.onPost(url).reply(500);
-    await renderLibraryPage();
 
     expect(await screen.findByRole('heading')).toBeInTheDocument();
     expect(screen.queryByText(/add content/i)).not.toBeInTheDocument();

src/library-authoring/common/context.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/require-default-props */
 import { useToggle } from '@openedx/paragon';
 import React from 'react';
 
@@ -27,8 +26,8 @@
   openInfoSidebar: () => {},
   openComponentInfoSidebar: (_usageKey: string) => {}, // eslint-disable-line @typescript-eslint/no-unused-vars
   isCreateCollectionModalOpen: false,
   openCreateCollectionModal: () => {},
   closeCreateCollectionModal: () => {},
 } as LibraryContextData);
 
 /**

src/library-authoring/data/api.test.ts

@@ -1,15 +1,5 @@
-import MockAdapter from 'axios-mock-adapter';
-import { initializeMockApp } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import {
-  commitLibraryChanges,
-  createCollection,
-  createLibraryBlock,
-  getCommitLibraryChangesUrl,
-  getCreateLibraryBlockUrl,
-  getLibraryCollectionsApiUrl,
-  revertLibraryChanges,
-} from './api';
+import { initializeMocks } from '../../testUtils';
+import * as api from './api';
 
 describe('library data API', () => {
   describe('createLibraryBlock', () => {
@@ -55,12 +45,13 @@ describe('library data API', () => {
   });
 
   it('should create collection', async () => {
+    const { axiosMock } = initializeMocks();
     const libraryId = 'lib:org:1';
-    const url = getLibraryCollectionsApiUrl(libraryId);
+    const url = api.getLibraryCollectionsApiUrl(libraryId);
 
     axiosMock.onPost(url).reply(200);
 
-    await createCollection(libraryId, {
+    await api.createCollection(libraryId, {
       title: 'This is a test',
       description: 'This is only a test',
     });