Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ end

if (
can_grade || (@assessment.show_rubric_to_students? && @submission.published?)
) && last_attempt&.auto_grading&.result
) && last_attempt&.auto_grading&.result&.dig('evaluation_results')
graded_solutions =
last_attempt.auto_grading.result['evaluation_results'].index_by do |result|
result['solution_id']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ const QuestionGrade: FC<QuestionGradeProps> = (props) => {
const published = workflowState === workflowStates.Published;

const isProgrammingQuestion = question.type === QuestionType.Programming;
const isTextResponseAndAutogradable =
question.type === QuestionType.TextResponse && question.autogradable;
const editable = !attempting && graderView;

const isNotGradedAndNotPublished =
Expand Down Expand Up @@ -319,9 +321,10 @@ const QuestionGrade: FC<QuestionGradeProps> = (props) => {
/>
)}

{editable && isProgrammingQuestion && (
<ReevaluateButton questionId={questionId} />
)}
{editable &&
(isProgrammingQuestion || isTextResponseAndAutogradable) && (
<ReevaluateButton questionId={questionId} />
)}

{editable && isRubricBasedResponseAndAutogradable && (
<div className="flex flex-row items-center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,66 @@
end
end
end

context 'when a text-response answer with a rubric is shown to the student' do
let(:course) { create(:course, :enrollable) }
let(:submitter) { create(:course_student, course: course).user }
let(:assessment) do
create(:assessment, :published_with_text_response_question, course: course,
show_rubric_to_students: true)
end
let(:submission) { create(:submission, :published, assessment: assessment, creator: submitter) }
let(:answer) { submission.answers.first }

before do
grading = answer.auto_grading || answer.build_auto_grading
grading.update!(result: auto_grading_result)
controller_sign_in(controller, submitter)
end

describe '#show' do
render_views
subject do
get :show, format: :json, params: {
course_id: course, assessment_id: assessment, submission_id: submission, id: answer.id
}
end

# Answers graded before spreadsheet formula autograding (commit b6da95a4ad) stored an
# auto_grading result without the `evaluation_results` key. Reading it unconditionally
# raised a NoMethodError (nil.index_by) when the rubric was shown to students.
context 'when the stored result predates evaluation_results' do
let(:auto_grading_result) { { 'messages' => [] } }

it 'renders successfully and omits the solution breakdown' do
expect(subject).to have_http_status(:success)
json_result = JSON.parse(response.body)

expect(json_result['fields']).to be_present
expect(json_result).not_to have_key('solutionResults')
end
end

context 'when the stored result includes evaluation_results' do
let(:auto_grading_result) do
{
'messages' => [],
'evaluation_results' => answer.question.specific.solutions.map do |solution|
{ 'solution_id' => solution.id, 'grade' => solution.grade }
end
}
end

it 'renders the solution breakdown' do
expect(subject).to have_http_status(:success)
json_result = JSON.parse(response.body)

expect(json_result['solutionResults']).to be_present
expect(json_result['solutionResults'].map { |result| result['id'] }).
to match_array(answer.question.specific.solutions.map(&:id))
end
end
end
end
end
end