From 60dfb7102826cd67a03b9c212c1652a7df135a69 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 8 Nov 2019 19:49:33 -0400 Subject: [PATCH] Improve workflow runtime link tests User actual runtime model instance as object for link resolution. Signed-off-by: Roberto Rosario --- mayan/apps/document_states/tests/mixins.py | 14 +++++++++++++- mayan/apps/document_states/tests/test_links.py | 18 +++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/mayan/apps/document_states/tests/mixins.py b/mayan/apps/document_states/tests/mixins.py index 84f5759780..54ea5ea023 100644 --- a/mayan/apps/document_states/tests/mixins.py +++ b/mayan/apps/document_states/tests/mixins.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from ..classes import WorkflowAction -from ..models import Workflow +from ..models import Workflow, WorkflowRuntimeProxy, WorkflowStateRuntimeProxy from .literals import ( TEST_WORKFLOW_INITIAL_STATE_LABEL, TEST_WORKFLOW_INITIAL_STATE_COMPLETION, @@ -96,6 +96,9 @@ class WorkflowTestMixin(object): label=TEST_WORKFLOW_LABEL, internal_name=TEST_WORKFLOW_INTERNAL_NAME ) + self.test_workflow_runtime_proxy = WorkflowRuntimeProxy.objects.get( + pk=self.test_workflow.pk + ) if add_document_type: self.test_workflow.document_types.add(self.test_document_type) @@ -105,6 +108,9 @@ class WorkflowTestMixin(object): completion=TEST_WORKFLOW_STATE_COMPLETION, label=TEST_WORKFLOW_STATE_LABEL ) + self.test_workflow_state_runtime_proxy = WorkflowStateRuntimeProxy.objects.get( + pk=self.test_workflow_state.pk + ) def _create_test_workflow_states(self): self.test_workflow_state_1 = self.test_workflow.states.create( @@ -115,6 +121,12 @@ class WorkflowTestMixin(object): completion=TEST_WORKFLOW_STATE_COMPLETION, label=TEST_WORKFLOW_STATE_LABEL ) + self.test_workflow_state_runtime_proxy_1 = WorkflowStateRuntimeProxy.objects.get( + pk=self.test_workflow_state_1.pk + ) + self.test_workflow_state_runtime_proxy_2 = WorkflowStateRuntimeProxy.objects.get( + pk=self.test_workflow_state_2.pk + ) def _create_test_workflow_transition(self): self.test_workflow_transition = self.test_workflow.transitions.create( diff --git a/mayan/apps/document_states/tests/test_links.py b/mayan/apps/document_states/tests/test_links.py index 9de4b7a390..fe2a6e3aa3 100644 --- a/mayan/apps/document_states/tests/test_links.py +++ b/mayan/apps/document_states/tests/test_links.py @@ -28,7 +28,7 @@ class WorkflowRuntimeProxyLinkTestCase( self._create_test_workflow(add_document_type=True) - self._resolve_test_link(test_object=self.test_workflow) + self._resolve_test_link(test_object=self.test_workflow_runtime_proxy) self.assertEqual(self.resolved_test_link, None) @@ -41,14 +41,14 @@ class WorkflowRuntimeProxyLinkTestCase( obj=self.test_workflow, permission=permission_workflow_view ) - self._resolve_test_link(test_object=self.test_workflow) + self._resolve_test_link(test_object=self.test_workflow_runtime_proxy) self.assertNotEqual(self.resolved_test_link, None) self.assertEqual( self.resolved_test_link.url, reverse( viewname=self.test_link.view, kwargs={ - 'pk': self.test_workflow.pk + 'pk': self.test_workflow_runtime_proxy.pk } ) ) @@ -86,7 +86,7 @@ class WorkflowRuntimeProxyLinkTestCase( self._create_test_workflow(add_document_type=True) self._create_test_workflow_state() - self._resolve_test_link(test_object=self.test_workflow_state) + self._resolve_test_link(test_object=self.test_workflow_state_runtime_proxy) self.assertEqual(self.resolved_test_link, None) @@ -100,14 +100,14 @@ class WorkflowRuntimeProxyLinkTestCase( obj=self.test_workflow, permission=permission_workflow_view ) - self._resolve_test_link(test_object=self.test_workflow_state) + self._resolve_test_link(test_object=self.test_workflow_state_runtime_proxy) self.assertNotEqual(self.resolved_test_link, None) self.assertEqual( self.resolved_test_link.url, reverse( viewname=self.test_link.view, kwargs={ - 'pk': self.test_workflow_state.pk + 'pk': self.test_workflow_state_runtime_proxy.pk } ) ) @@ -117,7 +117,7 @@ class WorkflowRuntimeProxyLinkTestCase( self._create_test_workflow(add_document_type=True) - self._resolve_test_link(test_object=self.test_workflow) + self._resolve_test_link(test_object=self.test_workflow_runtime_proxy) self.assertEqual(self.resolved_test_link, None) def test_workflow_runtime_proxy_state_list_link_with_access(self): @@ -129,14 +129,14 @@ class WorkflowRuntimeProxyLinkTestCase( obj=self.test_workflow, permission=permission_workflow_view ) - self._resolve_test_link(test_object=self.test_workflow) + self._resolve_test_link(test_object=self.test_workflow_runtime_proxy) self.assertNotEqual(self.resolved_test_link, None) self.assertEqual( self.resolved_test_link.url, reverse( viewname=self.test_link.view, kwargs={ - 'pk': self.test_workflow.pk + 'pk': self.test_workflow_runtime_proxy.pk } ) )