test: add tests

Author: Anas12091101

lms/djangoapps/course_home_api/progress/tests/test_views.py

@@ -282,8 +282,8 @@ def test_url_hidden_if_subsection_hide_after_due(self):
         assert hide_after_due_subsection['url'] is None
 
     @ddt.data(
-        (True, 0.7),  # midterm and final are visible to staff
-        (False, 0.3),  # just the midterm is visible to learners
+        (True, 0.72),  # lab, midterm and final are visible to staff
+        (False, 0.32),  # Only lab and midterm is visible to learners
     )
     @ddt.unpack
     def test_course_grade_considers_subsection_grade_visibility(self, is_staff, expected_percent):
@@ -301,14 +301,18 @@ def test_course_grade_considers_subsection_grade_visibility(self, is_staff, expe
             never = self.add_subsection_with_problem(format='Homework', show_correctness='never')
             always = self.add_subsection_with_problem(format='Midterm Exam', show_correctness='always')
             past_due = self.add_subsection_with_problem(format='Final Exam', show_correctness='past_due', due=tomorrow)
+            never_but_show_grade = self.add_subsection_with_problem(
+                format='Lab', show_correctness='never_but_include_grade'
+            )
 
         answer_problem(self.course, get_mock_request(self.user), never)
         answer_problem(self.course, get_mock_request(self.user), always)
         answer_problem(self.course, get_mock_request(self.user), past_due)
+        answer_problem(self.course, get_mock_request(self.user), never_but_show_grade)
 
         # First, confirm the grade in the database - it should never change based on user state.
         # This is midterm and final and a single problem added together.
-        assert CourseGradeFactory().read(self.user, self.course).percent == 0.72
+        assert CourseGradeFactory().read(self.user, self.course).percent == 0.73
 
         response = self.client.get(self.url)
         assert response.status_code == 200

lms/djangoapps/courseware/tests/test_views.py

@@ -1782,6 +1782,14 @@ def assert_progress_page_show_grades(self, response, show_correctness, due_date,
         (ShowCorrectness.PAST_DUE, TODAY, True),
         (ShowCorrectness.PAST_DUE, TOMORROW, False),
         (ShowCorrectness.PAST_DUE, TOMORROW, True),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, None, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, None, True),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, YESTERDAY, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, YESTERDAY, True),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TODAY, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TODAY, True),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TOMORROW, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TOMORROW, True),
     )
     @ddt.unpack
     def test_progress_page_no_problem_scores(self, show_correctness, due_date_name, graded):
@@ -1822,6 +1830,14 @@ def test_progress_page_no_problem_scores(self, show_correctness, due_date_name,
         (ShowCorrectness.PAST_DUE, TODAY, True, True),
         (ShowCorrectness.PAST_DUE, TOMORROW, False, False),
         (ShowCorrectness.PAST_DUE, TOMORROW, True, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, None, False, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, None, True, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, YESTERDAY, False, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, YESTERDAY , True, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TODAY, False, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TODAY, True, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TOMORROW, False, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TOMORROW, True, False),
     )
     @ddt.unpack
     def test_progress_page_hide_scores_from_learner(self, show_correctness, due_date_name, graded, show_grades):
@@ -1874,11 +1890,20 @@ def test_progress_page_hide_scores_from_learner(self, show_correctness, due_date
         (ShowCorrectness.PAST_DUE, TODAY, True, True),
         (ShowCorrectness.PAST_DUE, TOMORROW, False, True),
         (ShowCorrectness.PAST_DUE, TOMORROW, True, True),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, None, False, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, None, True, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, YESTERDAY, False, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, YESTERDAY, True, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TODAY, False, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TODAY, True, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TOMORROW, False, False),
+        (ShowCorrectness.NEVER_BUT_INCLUDE_GRADE, TOMORROW, True, False),
     )
     @ddt.unpack
     def test_progress_page_hide_scores_from_staff(self, show_correctness, due_date_name, graded, show_grades):
         """
-        Test that problem scores are hidden from staff viewing a learner's progress page only if show_correctness=never.
+        Test that problem scores are hidden from staff viewing a learner's progress page only if show_correctness is never
+        or never_but_include_grade.
         """
         due_date = self.DATES[due_date_name]
         self.setup_course(show_correctness=show_correctness, due_date=due_date, graded=graded)

xmodule/tests/test_graders.py

@@ -493,3 +493,11 @@ def test_show_correctness_past_due(self, due_date_str, has_staff_access, expecte
             due_date = getattr(self, due_date_str)
         assert ShowCorrectness.correctness_available(ShowCorrectness.PAST_DUE, due_date, has_staff_access) ==\
                expected_result
+
+    @ddt.data(True, False)
+    def test_show_correctness_never_but_include_grade(self, has_staff_access):
+        """
+        Test that show_correctness="never_but_include_grade" hides correctness from learners and course staff.
+        """
+        assert not ShowCorrectness.correctness_available(show_correctness=ShowCorrectness.NEVER_BUT_INCLUDE_GRADE,
+                                                         has_staff_access=has_staff_access)