diff --git a/.env b/.env index 8ef3c4cc..8e09a718 100644 --- a/.env +++ b/.env @@ -21,4 +21,4 @@ SITE_NAME='' USER_INFO_COOKIE_NAME='' SUPPORT_URL='' TA_FEEDBACK_FORM: '' -STAFF_FEEDBACK_FORM: '' +STAFF_FEEDBACK_FORM: '' \ No newline at end of file diff --git a/.env.test b/.env.test index 1747a171..aad7c71d 100644 --- a/.env.test +++ b/.env.test @@ -8,15 +8,15 @@ LMS_BASE_URL='http://localhost:18000' LEARNING_BASE_URL='http://localhost:2000' LOGIN_URL='http://localhost:18000/login' LOGOUT_URL='http://localhost:18000/logout' -LOGO_URL=https://edx-cdn.org/v3/default/logo.svg -LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg -LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg -FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico +LOGO_URL='https://edx-cdn.org/v3/default/logo.svg' +LOGO_TRADEMARK_URL='https://edx-cdn.org/v3/default/logo-trademark.svg' +LOGO_WHITE_URL='https://edx-cdn.org/v3/default/logo-white.svg' +FAVICON_URL='https://edx-cdn.org/v3/default/favicon.ico' MARKETING_SITE_BASE_URL='http://localhost:18000' ORDER_HISTORY_URL='http://localhost:1996/orders' REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh' SEGMENT_KEY='' -SITE_NAME=localhost +SITE_NAME='localhost' USER_INFO_COOKIE_NAME='edx-user-info' SUPPORT_URL='https://support.edx.org' TA_FEEDBACK_FORM: 'https://learner-form.test' diff --git a/jest.config.js b/jest.config.js index aaf1f4bc..3d49273b 100644 --- a/jest.config.js +++ b/jest.config.js @@ -2,7 +2,8 @@ const { createConfig } = require('@edx/frontend-build'); module.exports = createConfig('jest', { // setupFilesAfterEnv is used after the jest environment has been loaded. In general this is what you want. - // If you want to add config BEFORE jest loads, use setupFiles instead. + // If you want to add config BEFORE jest loads, use setupFiles instead. + setupFiles: ['/.env.test'], setupFilesAfterEnv: [ '/src/setupTest.js', ], diff --git a/src/discussions/discussions-home/InformationsBanner.jsx b/src/discussions/discussions-home/InformationsBanner.jsx index bf893e06..d2ad007b 100644 --- a/src/discussions/discussions-home/InformationsBanner.jsx +++ b/src/discussions/discussions-home/InformationsBanner.jsx @@ -15,8 +15,8 @@ function InformationBanner({ const userRoles = useSelector(selectUserRoles); const isAdmin = useSelector(selectUserIsStaff); const learnMoreLink = 'https://openedx.atlassian.net/wiki/spaces/COMM/pages/3509551260/Overview+New+discussions+experience'; - const TAFeedbackLink = process.env.TA_FEEDBACK_FORM || 'https://test-ta-feedback'; - const staffFeedbackLink = process.env.STAFF_FEEDBACK_FORM || 'https://test-staff-feedback'; + const TAFeedbackLink = process.env.TA_FEEDBACK_FORM || ''; + const staffFeedbackLink = process.env.STAFF_FEEDBACK_FORM || ''; const hideLearnMoreButton = ((userRoles.includes('Student') && userRoles.length === 1) || !userRoles.length) && !isAdmin; const showStaffLink = !hideLearnMoreButton && (userRoles.includes('Moderator') || userRoles.includes('Administrator'));