From 5e144deff7454fd02f3269c700c4ca09ce28ff25 Mon Sep 17 00:00:00 2001 From: Mehak Nasir Date: Mon, 19 Sep 2022 16:36:45 +0500 Subject: [PATCH] fix: permission fixes added for form --- .jest/setEnvVars.js | 2 ++ jest.config.js | 2 +- src/discussions/discussions-home/InformationBanner.test.jsx | 2 +- src/discussions/discussions-home/InformationsBanner.jsx | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 .jest/setEnvVars.js diff --git a/.jest/setEnvVars.js b/.jest/setEnvVars.js new file mode 100644 index 00000000..e31f19e6 --- /dev/null +++ b/.jest/setEnvVars.js @@ -0,0 +1,2 @@ +process.env.TA_FEEDBACK_FORM= 'https://learner-form.test'; +process.env.STAFF_FEEDBACK_FORM= 'https://staff-form.test'; \ No newline at end of file diff --git a/jest.config.js b/jest.config.js index 3d49273b..fe3adf37 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,7 +3,7 @@ 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. - setupFiles: ['/.env.test'], + setupFiles: ['/.jest/setEnvVars.js'], setupFilesAfterEnv: [ '/src/setupTest.js', ], diff --git a/src/discussions/discussions-home/InformationBanner.test.jsx b/src/discussions/discussions-home/InformationBanner.test.jsx index b73935a3..a88a33f7 100644 --- a/src/discussions/discussions-home/InformationBanner.test.jsx +++ b/src/discussions/discussions-home/InformationBanner.test.jsx @@ -119,7 +119,7 @@ describe('User is redirected according to url according to role', () => { }); test('moderators/administrators are redirected to moderators feedback form', async () => { - store.dispatch(fetchConfigSuccess(getConfigData(true, ['Student', 'Moderator', 'Administrator']))); + store.dispatch(fetchConfigSuccess(getConfigData(false, ['Student', 'Moderator', 'Administrator']))); renderComponent(true); expect(screen.getByText(messages.shareFeedback.defaultMessage) .closest('a')) diff --git a/src/discussions/discussions-home/InformationsBanner.jsx b/src/discussions/discussions-home/InformationsBanner.jsx index 1f9c3a1c..12b8ccb7 100644 --- a/src/discussions/discussions-home/InformationsBanner.jsx +++ b/src/discussions/discussions-home/InformationsBanner.jsx @@ -15,10 +15,10 @@ 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 || ''; - const staffFeedbackLink = process.env.STAFF_FEEDBACK_FORM || ''; + 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'); + const showStaffLink = isAdmin || userRoles.includes('Moderator') || userRoles.includes('Administrator'); return (