Merge branch 'master' into msa/security-contact

openedx · Jun 7, 2023 · 5a0c84b · 5a0c84b
2 parents 70d5c55 + a07d6f9
commit 5a0c84b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/data/redux/grading/selectors/validation.js b/src/data/redux/grading/selectors/validation.js
@@ -32,7 +32,7 @@ validation.criteria = createSelector(
       criterion.feedback === feedbackRequirement.required
       && gradingData.criteria[index].feedback === ''
     ),
-    selectedOption: gradingData.criteria[index].selectedOption !== '',
+    selectedOption: rubricConfig.criteria[index].options.length === 0 || gradingData.criteria[index].selectedOption !== '',
   })),
 );
 

diff --git a/src/data/redux/grading/selectors/validation.test.js b/src/data/redux/grading/selectors/validation.test.js
@@ -64,8 +64,8 @@ describe('validation grading selectors unit tests', () => {
       expect(preSelectors).toEqual([selected.gradingData, appSelectors.rubric.config]);
     });
     describe('returned object', () => {
-      const feedbackOptional = { feedback: feedbackRequirement.optional };
-      const feedbackRequired = { feedback: feedbackRequirement.required };
+      const feedbackOptional = { feedback: feedbackRequirement.optional, options: [1] };
+      const feedbackRequired = { feedback: feedbackRequirement.required, options: [1] };
       describe('feedback', () => {
         const validFeedback = { feedback: 'Fair' };
         const emptyFeedback = { feedback: '' };
@@ -85,6 +85,14 @@ describe('validation grading selectors unit tests', () => {
           );
           expect(output.map(({ selectedOption }) => selectedOption)).toEqual([true, false]);
         });
+        it('returns true criteria options are empty', () => {
+          const emptyOptionsFeedback = { ...feedbackOptional, options: [] };
+          const output = cb(
+            { criteria: [{ selectedOption: '' }, { selectedOption: 'Invalid' }] },
+            { criteria: [emptyOptionsFeedback, emptyOptionsFeedback] },
+          );
+          expect(output.map(({ selectedOption }) => selectedOption)).toEqual([true, true]);
+        });
       });
     });
   });