ErrorPa
jest.mock('@src/generic/PageLoading', () => jest.fn(() =>
PageLoading
));
+jest.mock('@openedx/paragon', () => {
+ const actual = jest.requireActual('@openedx/paragon');
+ const PropTypes = jest.requireActual('prop-types');
+
+ const MockModalDialog = ({ children, isOpen, onClose }) => {
+ if (!isOpen) { return null; }
+
+ return (
+
+
+
+ {children}
+
+
+ );
+ };
+
+ MockModalDialog.propTypes = {
+ children: PropTypes.node,
+ isOpen: PropTypes.bool,
+ onClose: PropTypes.func,
+ };
+
+ const createSubComponent = (baseClass) => {
+ const Component = ({ children, className }) => (
+
{children}
+ );
+ Component.propTypes = {
+ children: PropTypes.node,
+ className: PropTypes.string,
+ };
+ return Component;
+ };
+
+ MockModalDialog.Body = createSubComponent('mock-modal-body');
+ MockModalDialog.Header = createSubComponent('mock-modal-header');
+ MockModalDialog.Footer = createSubComponent('mock-modal-footer');
+
+ return {
+ ...actual,
+ ModalDialog: MockModalDialog,
+ };
+});
+
jest.mock('./hooks', () => ({
useIFrameBehavior: jest.fn(),
useModalIFrameData: jest.fn(),
diff --git a/src/plugin-slots/LearnerToolsSlot/index.test.jsx b/src/plugin-slots/LearnerToolsSlot/index.test.jsx
index 6cbbfad16a..9d0f732c29 100644
--- a/src/plugin-slots/LearnerToolsSlot/index.test.jsx
+++ b/src/plugin-slots/LearnerToolsSlot/index.test.jsx
@@ -1,10 +1,6 @@
import React from 'react';
import { render } from '@testing-library/react';
-jest.mock('@openedx/frontend-plugin-framework', () => ({
- PluginSlot: jest.fn(() =>
Plugin Slot
),
-}));
-
jest.mock('@edx/frontend-platform/auth', () => ({
getAuthenticatedUser: jest.fn(),
}));
@@ -103,7 +99,7 @@ describe('LearnerToolsSlot', () => {
render(
);
- // The portal should render to document.body
- expect(document.body.querySelector('[data-testid="plugin-slot"]')).toBeInTheDocument();
+ // The portal should render to document.body with the id as testid
+ expect(document.body.querySelector('[data-testid="org.openedx.frontend.learning.learner_tools.v1"]')).toBeInTheDocument();
});
});
diff --git a/src/product-tours/ProductTours.test.jsx b/src/product-tours/ProductTours.test.jsx
index 0818b07937..3aa622227c 100644
--- a/src/product-tours/ProductTours.test.jsx
+++ b/src/product-tours/ProductTours.test.jsx
@@ -27,6 +27,11 @@ import { buildOutlineFromBlocks } from '../courseware/data/__factories__/learnin
import { UserMessagesProvider } from '../generic/user-messages';
import { DECODE_ROUTES } from '../constants';
+import {
+ DismissButtonFormattedMessage,
+ NextButtonFormattedMessage,
+ OkayButtonFormattedMessage,
+} from './GenericTourFormattedMessages';
initializeMockApp();
jest.mock('@edx/frontend-platform/analytics');
@@ -158,6 +163,18 @@ describe('Course Home Tours', () => {
expect(await screen.queryByRole('dialog')).not.toBeInTheDocument();
},
);
+
+ describe('GenericTourFormattedMessages', () => {
+ it('renders all formatted message components to satisfy coverage', () => {
+ render(
);
+ render(
);
+ render(
);
+
+ expect(screen.getByText('Dismiss')).toBeInTheDocument();
+ expect(screen.getByText('Next')).toBeInTheDocument();
+ expect(screen.getByText('Okay')).toBeInTheDocument();
+ });
+ });
});
jest.mock(
diff --git a/src/setupTest.js b/src/setupTest.js
index 9018ad87d8..93b365a816 100755
--- a/src/setupTest.js
+++ b/src/setupTest.js
@@ -28,13 +28,11 @@ import buildSimpleCourseAndSequenceMetadata from './courseware/data/__factories_
import { buildOutlineFromBlocks } from './courseware/data/__factories__/learningSequencesOutline.factory';
jest.mock('@openedx/frontend-plugin-framework', () => {
- // eslint-disable-next-line global-require
- const MockedPluginSlot = require('./tests/MockedPluginSlot').default;
+ const MockedPluginSlot = jest.requireActual('./tests/MockedPluginSlot').default;
return {
- ...jest.requireActual('@openedx/frontend-plugin-framework'),
Plugin: () => 'Plugin',
- PluginSlot: MockedPluginSlot,
+ PluginSlot: jest.fn(MockedPluginSlot),
};
});
diff --git a/src/utils.ts b/src/utils.ts
index 5ea68509cd..35da3a0a5f 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -15,9 +15,9 @@ export const executeThunk = async (thunk, dispatch, getState = undefined) => {
*/
export const appendBrowserTimezoneToUrl = (url: string) => {
const browserTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
- const urlObject = new URL(url);
+ const urlObject = new URL(url, url.startsWith('http') ? undefined : 'http://localhost');
if (browserTimezone) {
urlObject.searchParams.append('browser_timezone', browserTimezone);
}
- return urlObject.href;
+ return url.startsWith('http') ? urlObject.href : `${urlObject.pathname}${urlObject.search}`;
};
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index ddf63def17..255eb108a9 100644
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -8,4 +8,13 @@ config.resolve.alias = {
'@src': path.resolve(__dirname, 'src'),
};
+// Fix for react-focus-on webpack 5 compatibility issue
+// The package has ES modules without file extensions in imports
+config.module.rules.push({
+ test: /\.m?js$/,
+ resolve: {
+ fullySpecified: false,
+ },
+});
+
module.exports = config;
diff --git a/webpack.prod.config.js b/webpack.prod.config.js
index fbe410772d..7ba61eb881 100644
--- a/webpack.prod.config.js
+++ b/webpack.prod.config.js
@@ -20,4 +20,13 @@ config.resolve.alias = {
'@src': path.resolve(__dirname, 'src'),
};
+// Fix for react-focus-on webpack 5 compatibility issue
+// The package has ES modules without file extensions in imports
+config.module.rules.push({
+ test: /\.m?js$/,
+ resolve: {
+ fullySpecified: false,
+ },
+});
+
module.exports = config;