richie-education 2.25.0-b2.dev97 → 2.25.0-b2.dev98

package/jest/setup.ts

@@ -24,6 +24,13 @@ RESET_MODULE_EXCEPTIONS.forEach((moduleName) => {
   });
 });
 
+beforeAll(() => {
+  // As dialog is rendered through a Portal, we have to add the DOM element in which the dialog will be rendered.
+  const modalExclude = document.createElement('div');
+  modalExclude.setAttribute('id', 'modal-exclude');
+  document.body.appendChild(modalExclude);
+});
+
 afterEach(() => {
   FactoryConfig.resetUniqueStore();
 });

package/js/components/ContractFrame/AbstractContractFrame.spec.tsx

@@ -42,12 +42,6 @@ describe('<AbstractContractFrame />', () => {
     );
   };
 
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     // SessionProvider api calls
     fetchMock.get('https://joanie.endpoint/api/v1.0/addresses/', []);

package/js/components/DjangoCMSTemplate/index.spec.tsx

@@ -27,7 +27,7 @@ describe('DjangoCMSTemplate', () => {
 
     expect(initMock).not.toHaveBeenCalled();
     render(<Wrapper />);
-    const expected = `<div><template class="cms-plugin cms-plugin-start plugin"></template>Hello world<template class="cms-plugin cms-plugin-end plugin"></template></div>`;
+    const expected = `<div id=\"modal-exclude\"></div><div><template class="cms-plugin cms-plugin-start plugin"></template>Hello world<template class="cms-plugin cms-plugin-end plugin"></template></div>`;
     expect(document.body.innerHTML).toEqual(expected);
     await waitFor(() => expect(initMock).toHaveBeenCalled());
   });
@@ -40,7 +40,7 @@ describe('DjangoCMSTemplate', () => {
     };
 
     render(<Wrapper />);
-    const expected = `<div>Hello world</div>`;
+    const expected = `<div id=\"modal-exclude\"></div><div>Hello world</div>`;
     expect(document.body.innerHTML).toEqual(expected);
   });
 });

package/js/components/Modal/index.spec.tsx

@@ -3,12 +3,6 @@ import { IntlProvider } from 'react-intl';
 import { Modal } from '.';
 
 describe('<Modal />', () => {
-  beforeEach(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   it('merges custom classNames of type string with the default classes', () => {
     render(
       <IntlProvider locale="en">

package/js/components/PurchaseButton/index.spec.tsx

@@ -28,13 +28,6 @@ jest.mock('utils/context', () => ({
 }));
 
 describe('PurchaseButton', () => {
-  beforeAll(() => {
-    // As dialog is rendered through a Portal, we have to add the DOM element in which the dialog will be rendered.
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   afterEach(() => {
     fetchMock.restore();
   });

package/js/components/SaleTunnel/index.spec.tsx

@@ -36,13 +36,6 @@ jest.mock('utils/context', () => ({
 }));
 
 describe('SaleTunnel', () => {
-  beforeAll(() => {
-    // As dialog is rendered through a Portal, we have to add the DOM element in which the dialog will be rendered.
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   afterEach(() => {
     fetchMock.restore();
   });

package/js/components/SignContractButton/index.omniscientOrders.spec.tsx

@@ -40,12 +40,6 @@ describe('<SignContractButton/>', () => {
     );
   };
 
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     // JoanieSession api omniscient calls
     fetchMock.get('https://joanie.endpoint/api/v1.0/addresses/', []);

package/js/components/SignContractButton/index.spec.tsx

@@ -39,12 +39,6 @@ interface FromContractTestData {
 }
 
 describe('<SignContractButton/>', () => {
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   describe.each<FromOrderTestData | FromContractTestData>([
     {
       testCase: TestCase.FROM_ORDER_WITH_CONTRACT,

package/js/pages/DashboardContracts/index.spec.tsx

@@ -53,13 +53,6 @@ describe('<DashboardContract/>', () => {
     </QueryClientProvider>
   );
 
-  beforeAll(() => {
-    // As dialog is rendered through a Portal, we have to add the DOM element in which the dialog will be rendered.
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     fetchMock.get('https://joanie.endpoint/api/v1.0/addresses/', []);
     fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', []);

package/js/pages/DashboardOrderLayout/index.spec.tsx

@@ -33,12 +33,6 @@ describe('<DashboardOrderLayout />', () => {
     );
   };
 
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     fetchMock.get('https://joanie.endpoint/api/v1.0/addresses/', []);
     fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', []);

package/js/pages/TeacherDashboardContractsLayout/TeacherDashboardContracts/index.spec.tsx

@@ -53,12 +53,6 @@ const Wrapper = ({ path, initialEntry }: { path: string; initialEntry: string })
 };
 
 describe('pages/TeacherDashboardContracts', () => {
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     // Joanie providers calls
     fetchMock.get('https://joanie.test/api/v1.0/orders/', []);

package/js/pages/TeacherDashboardContractsLayout/components/ContractActionsBar/index.spec.tsx

@@ -58,12 +58,6 @@ describe('TeacherDashboardContractsLayout/ContractActionsBar', () => {
     );
   };
 
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     // useTeacherContractsToSign mocked values
     mockCanSignContracts = true;

package/js/pages/TeacherDashboardContractsLayout/components/SignOrganizationContractButton/index.spec.tsx

@@ -29,12 +29,6 @@ describe('TeacherDashboardContractsLayout/SignOrganizationContractButton', () =>
     );
   };
 
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   afterEach(() => {
     fetchMock.restore();
   });

package/js/widgets/Dashboard/components/DashboardItem/Contract/index.spec.tsx

@@ -50,10 +50,6 @@ describe.each([
   beforeAll(() => {
     // eslint-disable-next-line compat/compat
     URL.createObjectURL = jest.fn();
-
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
   });
 
   beforeEach(() => {

package/js/widgets/Dashboard/components/DashboardItem/Enrollment/ProductCertificateFooter/index.spec.tsx

@@ -67,13 +67,6 @@ describe('<ProductCertificateFooter/>', () => {
   let product: CertificateProduct;
   let course: CourseLight;
 
-  beforeAll(() => {
-    // As dialog is rendered through a Portal, we have to add the DOM element in which the dialog will be rendered.
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     fetchMock.get('https://joanie.endpoint.test/api/v1.0/addresses/', []);
     fetchMock.get('https://joanie.endpoint.test/api/v1.0/credit-cards/', []);

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.spec.tsx

@@ -83,12 +83,6 @@ describe('<DashboardItemOrder/>', () => {
     );
   };
 
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     fetchMock.get('https://joanie.endpoint/api/v1.0/addresses/', []);
     fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', []);

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderContract.spec.tsx

@@ -55,12 +55,6 @@ describe('<DashboardItemOrder/> Contract', () => {
     );
   };
 
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     fetchMock.get('https://joanie.endpoint/api/v1.0/addresses/', []);
     fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', []);

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderContract.useUnionResource.cache.spec.tsx

@@ -47,12 +47,6 @@ describe('<DashboardItemOrder/> Contract', () => {
     );
   };
 
-  beforeAll(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     jest.useFakeTimers();
     jest.clearAllTimers();

package/js/widgets/Search/components/SearchFilterGroup/index.spec.tsx

@@ -53,11 +53,6 @@ describe('widgets/Search/components/SearchFilterGroup', () => {
   };
 
   beforeEach(jest.resetAllMocks);
-  beforeEach(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
 
   it('renders the name of the filter with the values as SearchFilters', () => {
     render(

package/js/widgets/Search/components/SearchFilterGroupModal/index.spec.tsx

@@ -63,11 +63,6 @@ describe('<SearchFilterGroupModal />', () => {
 
   beforeEach(() => fetchMock.restore());
   beforeEach(jest.resetAllMocks);
-  beforeEach(() => {
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
 
   it('renders a button with a modal to search values for a given filter', async () => {
     {

package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/index.spec.tsx

@@ -71,13 +71,6 @@ describe('CourseProductItem', () => {
       style: 'currency',
     }).format(price);
 
-  beforeAll(() => {
-    // As dialog is rendered through a Portal, we have to add the DOM element in which the dialog will be rendered.
-    const modalExclude = document.createElement('div');
-    modalExclude.setAttribute('id', 'modal-exclude');
-    document.body.appendChild(modalExclude);
-  });
-
   beforeEach(() => {
     // JoanieSessionProvider requests
     fetchMock.get('https://joanie.test/api/v1.0/addresses/', []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "2.25.0-b2.dev97",
+  "version": "2.25.0-b2.dev98",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {