test: refactor mocking to fix tests

openedx · Jan 16, 2024 · 969ae6e · 969ae6e
1 parent 1cc7a93
commit 969ae6e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 32 deletions.
diff --git a/openassessment/xblock/test/base.py b/openassessment/xblock/test/base.py
@@ -3,12 +3,14 @@
 """
 
 
+from contextlib import contextmanager
 import copy
 from functools import wraps
 import json
 import os.path
 
 from unittest import mock
+from mock import PropertyMock, patch
 from workbench.runtime import WorkbenchRuntime
 
 import webob
@@ -503,12 +505,18 @@ def set_staff_access(xblock):
         xblock.xmodule_runtime.anonymous_student_id = 'Bob'
 
     @staticmethod
-    def set_mock_workflow_info(xblock, workflow_status, status_details, submission_uuid):
-        xblock.get_workflow_info = mock.Mock(return_value={
-            'status': workflow_status,
-            'status_details': status_details,
-            'submission_uuid': submission_uuid
-        })
+    @contextmanager
+    def mock_workflow_status(workflow_status, status_details, submission_uuid):
+        with patch(
+            "openassessment.xblock.apis.workflow_api.WorkflowAPI.workflow",
+            new_callable=PropertyMock,
+        ) as mock_workflow:
+            mock_workflow.return_value = {
+                "status": workflow_status,
+                "status_details": status_details,
+                "submission_uuid": submission_uuid,
+            }
+            yield
 
     def submit_staff_assessment(self, xblock, submission, assessment):
         """

diff --git a/openassessment/xblock/test/test_staff.py b/openassessment/xblock/test/test_staff.py
@@ -95,34 +95,30 @@ def _verify_grade_templates_workflow(self, xblock):
 
         # Verify that once the required step (self assessment) is done, the staff grade is shown as complete.
         status_details = {'peer': {'complete': True}}
-        self.set_mock_workflow_info(
-            xblock, workflow_status='done', status_details=status_details, submission_uuid=submission['uuid']
-        )
-        self._assert_path_and_context(
-            xblock,
-            {
-                'status_value': 'Complete',
-                'icon_class': 'fa-check',
-                'step_classes': 'is--showing',
-                'button_active': 'aria-expanded="true"',
-                'xblock_id': xblock.scope_ids.usage_id
-            }
-        )
+        with self.mock_workflow_status('done', status_details, submission["uuid"]):
+            self._assert_path_and_context(
+                xblock,
+                {
+                    'status_value': 'Complete',
+                    'icon_class': 'fa-check',
+                    'step_classes': 'is--showing',
+                    'button_active': 'aria-expanded="true"',
+                    'xblock_id': xblock.scope_ids.usage_id
+                }
+            )
 
         # Verify that if the problem is cancelled, the staff grade reflects this.
-        self.set_mock_workflow_info(
-            xblock, workflow_status='cancelled', status_details=status_details, submission_uuid=submission['uuid']
-        )
-        self._assert_path_and_context(
-            xblock,
-            {
-                'status_value': 'Cancelled',
-                'icon_class': 'fa-exclamation-triangle',
-                'button_active': 'disabled="disabled" aria-expanded="false"',
-                'step_classes': 'is--unavailable',
-                'xblock_id': xblock.scope_ids.usage_id
-            }
-        )
+        with self.mock_workflow_status('cancelled', status_details, submission['uuid']):
+            self._assert_path_and_context(
+                xblock,
+                {
+                    'status_value': 'Cancelled',
+                    'icon_class': 'fa-exclamation-triangle',
+                    'button_active': 'disabled="disabled" aria-expanded="false"',
+                    'step_classes': 'is--unavailable',
+                    'xblock_id': xblock.scope_ids.usage_id
+                }
+            )
 
     @scenario('data/grade_waiting_scenario.xml', user_id='Omar')
     def test_staff_grade_templates_no_peer(self, xblock):