ISSUE-662: Add test cases

Author: Mateo

Changelog.md

@@ -10,6 +10,7 @@
 - Added functionality to apply bonuses and penalties as a percentage of the student's earned marks to ExtraMark model (#7702)
 - Switched to consistent Font Awesome chevrons for expander icons (#7713)
 - Install Ruby-LSP to allow development inside different IDEs such as VSCode (#7718)
+- Assign extra marks in test definition. (Currently limited to pytest files) (#7728)
 
 ### 🐛 Bug fixes
 - Fix name column search in graders table (#7693)

spec/models/test_run_spec.rb

@@ -173,6 +173,157 @@
         }] }.deep_stringify_keys
     end
 
+    context 'extra marks (bonus_comments)' do
+      let(:base_results) { results.deep_dup } # keep original intact
+
+      shared_context 'bonus setup' do
+        before do
+          submission.reload
+          submission.current_result.update!(released_to_students: false)
+          allow(grouping).to receive(:current_submission_used).and_return(submission)
+        end
+      end
+
+      context 'when the test run has a submission and a valid POINTS bonus' do
+        include_context 'bonus setup'
+
+        let(:submission) { create(:version_used_submission, grouping: grouping) }
+        let(:test_run) do
+          create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+        end
+
+        before do
+          base_results['test_groups'].first['tests'].first['extra_properties'] = {
+            'bonus_comments' => [
+              {
+                'mark' => 3,
+                'unit' => 'points',
+                'description' => 'this is a test comment'
+              }
+            ]
+          }
+        end
+
+        it 'creates an ExtraMark on the submission result' do
+          expect { test_run.update_results!(base_results) }.to change { ExtraMark.count }.by(1)
+          em = ExtraMark.last
+          expect(em.unit).to eq ExtraMark::POINTS
+          expect(em.extra_mark).to eq 3
+          expect(em.result_id).to eq submission.current_result.id
+          expect(em.description).to eq 'this is a test comment'
+        end
+
+        it 'adds the points to the test_group_result.marks_earned' do
+          test_run.update_results!(base_results)
+          tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+          # baseline earned = 1 (from first test), +3 bonus = 4 total
+          expect(tgr.marks_earned).to eq 4
+          expect(tgr.marks_total).to eq 2 # unchanged
+        end
+      end
+
+      context 'when the test run has a submission and a non-POINTS unit (percentage)' do
+        include_context 'bonus setup'
+
+        let(:submission) { create(:version_used_submission, grouping: grouping) }
+        let(:test_run) do
+          create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+        end
+
+        before do
+          base_results['test_groups'].first['tests'].first['extra_properties'] = {
+            'bonus_comments' => [
+              { 'unit' => ExtraMark::PERCENTAGE, 'mark' => 10, 'description' => '10% bump' }
+            ]
+          }
+        end
+
+        it 'creates an ExtraMark but does not change marks_earned' do
+          expect { test_run.update_results!(base_results) }.to change { ExtraMark.count }.by(1)
+          tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+          # baseline earned remains 1 since non-POINTS units don’t add to marks_earned
+          expect(tgr.marks_earned).to eq 1
+          expect(tgr.marks_total).to eq 2
+        end
+      end
+
+      context 'when the unit is invalid' do
+        let(:submission) { create(:version_used_submission, grouping: grouping) }
+        let(:test_run) do
+          create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+        end
+
+        before do
+          base_results['test_groups'].first['tests'].first['extra_properties'] = {
+            'bonus_comments' => [
+              { 'unit' => 'bananas', 'mark' => 99, 'description' => 'nope' }
+            ]
+          }
+        end
+
+        it 'ignores the comment and does not create an ExtraMark nor change marks' do
+          expect { test_run.update_results!(base_results) }.not_to(change { ExtraMark.count })
+          tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+          expect(tgr.marks_earned).to eq 1
+          expect(tgr.marks_total).to eq 2
+        end
+      end
+
+      context 'when bonus_comments is not an array' do
+        let(:submission) { create(:version_used_submission, grouping: grouping) }
+        let(:test_run) do
+          create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+        end
+
+        before do
+          base_results['test_groups'].first['tests'].first['extra_properties'] = {
+            'bonus_comments' => 'not-an-array'
+          }
+        end
+
+        it 'does nothing' do
+          expect { test_run.update_results!(base_results) }.not_to(change { ExtraMark.count })
+          tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+          expect(tgr.marks_earned).to eq 1
+          expect(tgr.marks_total).to eq 2
+        end
+      end
+
+      context 'when bonus_comments is missing' do
+        let(:submission) { create(:version_used_submission, grouping: grouping) }
+        let(:test_run) do
+          create(:test_run, status: :in_progress, submission: submission, grouping: grouping, autotest_test_id: 1)
+        end
+
+        it 'does nothing' do
+          expect { test_run.update_results!(base_results) }.not_to(change { ExtraMark.count })
+          tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+          expect(tgr.marks_earned).to eq 1
+          expect(tgr.marks_total).to eq 2
+        end
+      end
+
+      context 'when there is no submission result (no submission on the test run)' do
+        let(:test_run) { create(:test_run, status: :in_progress, grouping: grouping, autotest_test_id: 1) }
+
+        before do
+          base_results['test_groups'].first['tests'].first['extra_properties'] = {
+            'bonus_comments' => [
+              { 'unit' => ExtraMark::POINTS, 'mark' => 5, 'description' => 'should be ignored' }
+            ]
+          }
+        end
+
+        it 'does not create ExtraMark and does not change marks_earned' do
+          expect { test_run.update_results!(base_results) }.not_to(change { ExtraMark.count })
+          tgr = TestGroupResult.find_by(test_group_id: test_group.id, test_run_id: test_run.id)
+          # no submission => add_extra_marks_to_test! returns 0, so only earned = 1 baseline
+          expect(tgr.marks_earned).to eq 1
+          expect(tgr.marks_total).to eq 2
+        end
+      end
+    end
+
     context 'when there are feedback files' do
       let(:feedback_files) { test_group.test_group_results.first.feedback_files }