From a6fdf94b9cf43b3dab203b87227c05e5e9ee1774 Mon Sep 17 00:00:00 2001 From: Tamara Date: Tue, 17 Dec 2024 15:00:44 -0600 Subject: [PATCH] Address PR feedback Move validation check to top of scoring function Make test function an arrow function --- .../src/widgets/label-image/score-label-image.ts | 10 +++++----- .../widgets/label-image/validate-label-image.test.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/perseus/src/widgets/label-image/score-label-image.ts b/packages/perseus/src/widgets/label-image/score-label-image.ts index 6556905e70..97968e32bd 100644 --- a/packages/perseus/src/widgets/label-image/score-label-image.ts +++ b/packages/perseus/src/widgets/label-image/score-label-image.ts @@ -46,6 +46,11 @@ function scoreLabelImage( userInput: PerseusLabelImageUserInput, scoringData: PerseusLabelImageScoringData, ): PerseusScore { + const validationError = validateLabelImage(userInput); + if (validationError) { + return validationError; + } + let numCorrect = 0; for (let i = 0; i < userInput.markers.length; i++) { @@ -59,11 +64,6 @@ function scoreLabelImage( } } - const validationError = validateLabelImage(userInput); - if (validationError) { - return validationError; - } - return { type: "points", // Markers with no expected answers are graded as correct if user diff --git a/packages/perseus/src/widgets/label-image/validate-label-image.test.ts b/packages/perseus/src/widgets/label-image/validate-label-image.test.ts index 590d7bd7b5..3225689a00 100644 --- a/packages/perseus/src/widgets/label-image/validate-label-image.test.ts +++ b/packages/perseus/src/widgets/label-image/validate-label-image.test.ts @@ -2,7 +2,7 @@ import validateLabelImage from "./validate-label-image"; import type {PerseusLabelImageUserInput} from "../../validation.types"; -describe("scoreLabelImage", function () { +describe("scoreLabelImage", () => { it("should not grade non-interacted widget", function () { const userInput: PerseusLabelImageUserInput = { markers: [{label: "England"}, {label: "Germany"}, {label: "Italy"}],