From 8bf4c7539b1a8b3f7d756a48b64a7352d8e927e4 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario@mayan-edms.com>
Date: Fri, 8 Nov 2019 20:43:13 -0400
Subject: [PATCH] Improve TestModelTestMixin

- Allow specifying a base model.
- Fix passing the dynamic Meta class to the test model.

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
---
 HISTORY.rst                       |  3 +++
 mayan/apps/common/tests/mixins.py | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 402d28d312..a1b219b34a 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -122,6 +122,9 @@
   action to support templates.
 - DjangoSMTP mailer password field size increased to 192
   characters.
+- Improve TestModelTestMixin. Allow specifying a base model.
+  Fix passing the dynamic Meta class to the test model.
+  
 
 3.2.9 (2019-11-03)
 ==================
diff --git a/mayan/apps/common/tests/mixins.py b/mayan/apps/common/tests/mixins.py
index e6ee2027d3..29379b6de1 100644
--- a/mayan/apps/common/tests/mixins.py
+++ b/mayan/apps/common/tests/mixins.py
@@ -323,8 +323,10 @@ class TempfileCheckTestCasekMixin(object):
 class TestModelTestMixin(object):
     _test_models = []
 
-    def _create_test_model(self, fields=None, model_name='TestModel', options=None):
-
+    def _create_test_model(
+        self, base_class=models.Model, fields=None, model_name='TestModel',
+        options=None
+    ):
         if connection.vendor == 'mysql':
             self.skipTest(
                 reason='MySQL doesn\'t support schema changes inside an '
@@ -338,7 +340,7 @@ class TestModelTestMixin(object):
         app_label = app_config.label
 
         class Meta:
-            pass
+            """Empty Meta class to be populated by the 'options' argument"""
 
         setattr(Meta, 'app_label', app_label)
 
@@ -359,7 +361,7 @@ class TestModelTestMixin(object):
                 return instance.save_base(force_insert=True)
 
         attrs = {
-            '__module__': self.__class__.__module__, 'save': save, 'Meta': Meta
+            '__module__': self.__class__.__module__, 'save': save, 'meta': Meta
         }
 
         if fields:
@@ -372,11 +374,11 @@ class TestModelTestMixin(object):
 
         if PY3:
             TestModel = type(
-                model_name, (models.Model,), attrs
+                model_name, (base_class,), attrs
             )
         else:
             TestModel = type(
-                force_bytes(model_name), (models.Model,), attrs
+                force_bytes(model_name), (base_class,), attrs
             )
 
         setattr(self, model_name, TestModel)
@@ -387,10 +389,12 @@ class TestModelTestMixin(object):
 
         ContentType.objects.clear_cache()
 
+        return TestModel
+
     def _create_test_object(self, model_name='TestModel', **kwargs):
         TestModel = getattr(self, model_name)
 
-        self.test_object = TestModel.objects.create(**kwargs)
+        return TestModel.objects.create(**kwargs)
 
 
 class TestServerTestCaseMixin(object):