Merge branch 'master' into rpenido/fal-4068/add-unit-collections-support

Author: rpenido

package-lock.json

@@ -60,8 +60,8 @@
     "@openedx-plugins/course-app-wiki": "file:plugins/course-apps/wiki",
     "@openedx-plugins/course-app-xpert_unit_summary": "file:plugins/course-apps/xpert_unit_summary",
     "@openedx/frontend-build": "^14.3.3",
-    "@openedx/frontend-slot-footer": "^1.2.0",
     "@openedx/frontend-plugin-framework": "^1.6.0",
+    "@openedx/frontend-slot-footer": "^1.2.0",
     "@openedx/paragon": "^22.16.0",
     "@redux-devtools/extension": "^3.3.0",
     "@reduxjs/toolkit": "1.9.7",

package.json

@@ -68,13 +68,6 @@ const courseId = '123';
 
 window.HTMLElement.prototype.scrollIntoView = jest.fn();
 
-const clipboardBroadcastChannelMock = {
-  postMessage: jest.fn(),
-  close: jest.fn(),
-};
-
-global.BroadcastChannel = jest.fn(() => clipboardBroadcastChannelMock);
-
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useLocation: jest.fn(),

src/course-outline/CourseOutline.test.jsx

@@ -21,13 +21,6 @@ jest.mock('react-router-dom', () => ({
   }),
 }));
 
-const clipboardBroadcastChannelMock = {
-  postMessage: jest.fn(),
-  close: jest.fn(),
-};
-
-global.BroadcastChannel = jest.fn(() => clipboardBroadcastChannelMock);
-
 const unit = {
   id: 'unit-1',
 };

src/course-outline/subsection-card/SubsectionCard.test.jsx

@@ -47,13 +47,6 @@ const unit = {
 
 const queryClient = new QueryClient();
 
-const clipboardBroadcastChannelMock = {
-  postMessage: jest.fn(),
-  close: jest.fn(),
-};
-
-global.BroadcastChannel = jest.fn(() => clipboardBroadcastChannelMock);
-
 const renderComponent = (props) => render(
   <AppProvider store={store}>
     <QueryClientProvider client={queryClient}>

src/course-outline/unit-card/UnitCard.test.jsx

@@ -93,13 +93,6 @@ jest.mock('react-router-dom', () => ({
   useNavigate: () => mockedUsedNavigate,
 }));
 
-const clipboardBroadcastChannelMock = {
-  postMessage: jest.fn(),
-  close: jest.fn(),
-};
-
-global.BroadcastChannel = jest.fn(() => clipboardBroadcastChannelMock);
-
 /**
  * Simulates receiving a post message event for testing purposes.
  * This can be used to mimic events like deletion or other actions

src/course-unit/CourseUnit.test.jsx

@@ -22,13 +22,6 @@ let axiosMock;
 let queryClient;
 const courseId = '123';
 
-const clipboardBroadcastChannelMock = {
-  postMessage: jest.fn(),
-  close: jest.fn(),
-};
-
-global.BroadcastChannel = jest.fn(() => clipboardBroadcastChannelMock);
-
 const renderComponent = (props = {}) => render(
   <AppProvider store={store}>
     <IntlProvider locale="en">

src/course-unit/sidebar/components/sidebar-footer/ActionButtons.test.jsx

@@ -6,7 +6,6 @@ import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { Provider } from 'react-redux';
 
 import { messageTypes } from '../../../constants';
-import { mockBroadcastChannel } from '../../../../generic/data/api.mock';
 import initializeStore from '../../../../store';
 import { useMessageHandlers } from '..';
 
@@ -20,8 +19,6 @@ jest.mock('@edx/frontend-platform/logging', () => ({
   logError: jest.fn(),
 }));
 
-mockBroadcastChannel();
-
 describe('useMessageHandlers', () => {
   let handlers;
   let result;

src/course-unit/xblock-container-iframe/hooks/tests/hooks.test.tsx

@@ -18,7 +18,7 @@ import { useEditorContext } from '../../EditorContext';
 import TitleHeader from './components/TitleHeader';
 import * as hooks from './hooks';
 import messages from './messages';
-import { parseErrorMsg } from '../../../library-authoring/add-content/AddContentContainer';
+import { parseErrorMsg } from '../../../library-authoring/add-content/AddContent';
 import libraryMessages from '../../../library-authoring/add-content/messages';
 
 import './index.scss';

src/editors/containers/EditorContainer/index.tsx

@@ -7,7 +7,7 @@ import {
 } from '../../../__mocks__';
 import { initializeMocks, makeWrapper } from '../../../testUtils';
 import { getClipboardUrl } from '../../data/api';
-import useClipboard from './useClipboard';
+import useClipboard, { _testingOverrideBroadcastChannel } from './useClipboard';
 
 initializeMocks();
 
@@ -16,13 +16,14 @@ let mockShowToast: jest.Mock;
 
 const unitId = 'block-v1:edX+DemoX+Demo_Course+type@vertical+block@vertical_0270f6de40fc';
 const xblockId = 'block-v1:edX+DemoX+Demo_Course+type@html+block@030e35c4756a4ddc8d40b95fbbfff4d4';
+
+let broadcastMockListener: (x: unknown) => void | undefined;
 const clipboardBroadcastChannelMock = {
-  postMessage: jest.fn(),
-  close: jest.fn(),
-  onmessage: jest.fn(),
+  postMessage: (message: unknown) => { broadcastMockListener(message); },
+  addEventListener: (_eventName: string, handler: typeof broadcastMockListener) => { broadcastMockListener = handler; },
+  removeEventListener: jest.fn(),
 };
-
-(global as any).BroadcastChannel = jest.fn(() => clipboardBroadcastChannelMock);
+_testingOverrideBroadcastChannel(clipboardBroadcastChannelMock as any);
 
 describe('useClipboard', () => {
   beforeEach(async () => {
@@ -88,14 +89,14 @@ describe('useClipboard', () => {
   describe('broadcast channel message handling', () => {
     it('updates states correctly on receiving a broadcast message', async () => {
       const { result, rerender } = renderHook(() => useClipboard(true), { wrapper: makeWrapper() });
-      clipboardBroadcastChannelMock.onmessage({ data: clipboardUnit });
+      clipboardBroadcastChannelMock.postMessage({ data: clipboardUnit });
 
       rerender();
 
       expect(result.current.showPasteUnit).toBe(true);
       expect(result.current.showPasteXBlock).toBe(false);
 
-      clipboardBroadcastChannelMock.onmessage({ data: clipboardXBlock });
+      clipboardBroadcastChannelMock.postMessage({ data: clipboardXBlock });
       rerender();
 
       expect(result.current.showPasteUnit).toBe(false);