refactor: fix tests after refactor

eduNEXT · Oct 5, 2023 · d1b21bd · d1b21bd
1 parent 8d07b3a
commit d1b21bd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/mindmap/mindmap.py b/mindmap/mindmap.py
@@ -251,6 +251,7 @@ def get_context(self, in_student_view=False):
                 "raw_score": self.raw_score,
                 "max_raw_score": self.points,
                 "weight": self.weight,
+                "weighted_score": self.get_weighted_score(),
             })
 
         return context

diff --git a/mindmap/public/html/mindmap.html b/mindmap/public/html/mindmap.html
@@ -53,10 +53,10 @@
 
 <div id="jsmind_container_{{xblock_id}}" class="jsmind_container"></div>
 
-{% if not is_static and has_score and not raw_score and in_student_view %}
-  <p>(0/{{ max_raw_score }} {% trans "points" %}) {% trans submission_status %}</p>
-{% elif not is_static and has_score and raw_score and in_student_view %}
-  <p>({{ raw_score }}/{{ max_raw_score }} {% trans "points" %}) {% trans submission_status %}</p>
+{% if not is_static and has_score and not weighted_score and in_student_view %}
+  <p>(0/{{ weight }} {% trans "points" %}) {% trans submission_status %}</p>
+{% elif not is_static and has_score and weighted_score and in_student_view %}
+  <p>({{ weighted_score }}/{{ weight }} {% trans "points" %}) {% trans submission_status %}</p>
 {% endif %}
 
 {% if editable and in_student_view and can_submit_assignment %}

diff --git a/mindmap/tests/test_mindmap.py b/mindmap/tests/test_mindmap.py
@@ -81,6 +81,7 @@ def test_student_view_with_mind_map(self, initialize_js_mock: Mock):
             "raw_score": 50,
             "max_raw_score": self.xblock.points,
             "weight": self.xblock.weight,
+            "weighted_score": self.xblock.get_weighted_score(),
         }
         expected_js_context = {
             "author": self.student.full_name,
@@ -127,6 +128,7 @@ def test_student_view_empty_mind_map(self, initialize_js_mock: Mock):
             "raw_score": 50,
             "max_raw_score": self.xblock.points,
             "weight": self.xblock.weight,
+            "weighted_score": self.xblock.get_weighted_score(),
         }
         expected_js_context = {
             "author": self.student.full_name,
@@ -173,6 +175,7 @@ def test_static_mind_map_in_student_view(self):
             "raw_score": 50,
             "max_raw_score": self.xblock.points,
             "weight": self.xblock.weight,
+            "weighted_score": self.xblock.get_weighted_score(),
         }
 
         self.xblock.student_view()
@@ -210,6 +213,7 @@ def test_student_view_for_instructor(self):
             "raw_score": 50,
             "max_raw_score": self.xblock.points,
             "weight": self.xblock.weight,
+            "weighted_score": self.xblock.get_weighted_score(),
         }
 
         self.xblock.student_view()
@@ -250,6 +254,7 @@ def test_studio_view(self):
             "submission_status": self.xblock.submission_status,
             "raw_score": 50,
             "max_raw_score": self.xblock.points,
+            "weighted_score": self.xblock.get_weighted_score(),
         }
 
         self.xblock.studio_view()
@@ -285,6 +290,7 @@ def test_author_view(self):
             "has_score_field": self.xblock.fields["has_score"],
             "submission_status": self.xblock.submission_status,
             "weight": self.xblock.weight,
+            "weighted_score": self.xblock.get_weighted_score(),
         }
 
         self.xblock.author_view()
@@ -329,6 +335,7 @@ def test_student_not_allowed_submission(self, initialize_js_mock: Mock):
             "raw_score": 50,
             "max_raw_score": self.xblock.points,
             "weight": self.xblock.weight,
+            "weighted_score": self.xblock.get_weighted_score(),
         }
         expected_js_context = {
             "author": self.student.full_name,