From 01e8b5dce3671b61365b9c7dff3d65b2ffe0f1eb Mon Sep 17 00:00:00 2001
From: Matthias <code@mjmair.com>
Date: Wed, 11 May 2022 14:21:16 +0200
Subject: [PATCH] remove InvenTreePluginBase

---
 InvenTree/common/models.py      |  4 +--
 InvenTree/plugin/__init__.py    |  3 +--
 InvenTree/plugin/models.py      |  4 +--
 InvenTree/plugin/test_plugin.py | 48 +++++++++++++++------------------
 4 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 11157763cb..e50fb06b6e 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -257,9 +257,9 @@ class BaseInvenTreeSetting(models.Model):
         plugin = kwargs.get('plugin', None)
 
         if plugin is not None:
-            from plugin import InvenTreePluginBase
+            from plugin import IntegrationPluginBase
 
-            if issubclass(plugin.__class__, InvenTreePluginBase):
+            if issubclass(plugin.__class__, IntegrationPluginBase):
                 plugin = plugin.plugin_config()
 
             filters['plugin'] = plugin
diff --git a/InvenTree/plugin/__init__.py b/InvenTree/plugin/__init__.py
index 6ccd106253..827072b5ae 100644
--- a/InvenTree/plugin/__init__.py
+++ b/InvenTree/plugin/__init__.py
@@ -3,14 +3,13 @@ Utility file to enable simper imports
 """
 
 from .registry import registry
-from .plugin import InvenTreePluginBase, IntegrationPluginBase
+from .plugin import IntegrationPluginBase
 from .helpers import MixinNotImplementedError, MixinImplementationError
 
 __all__ = [
     'registry',
 
     'IntegrationPluginBase',
-    'InvenTreePluginBase',
     'MixinNotImplementedError',
     'MixinImplementationError',
 ]
diff --git a/InvenTree/plugin/models.py b/InvenTree/plugin/models.py
index 0624693abc..a3cc25ec96 100644
--- a/InvenTree/plugin/models.py
+++ b/InvenTree/plugin/models.py
@@ -11,7 +11,7 @@ from django.contrib.auth.models import User
 
 import common.models
 
-from plugin import InvenTreePluginBase, registry
+from plugin import IntegrationPluginBase, registry
 
 
 class PluginConfig(models.Model):
@@ -135,7 +135,7 @@ class PluginSetting(common.models.GenericReferencedSettingClass, common.models.B
 
             if plugin:
 
-                if issubclass(plugin.__class__, InvenTreePluginBase):
+                if issubclass(plugin.__class__, IntegrationPluginBase):
                     plugin = plugin.plugin_config()
 
                 kwargs['settings'] = registry.mixins_settings.get(plugin.key, {})
diff --git a/InvenTree/plugin/test_plugin.py b/InvenTree/plugin/test_plugin.py
index eee3230d2a..601c557a1a 100644
--- a/InvenTree/plugin/test_plugin.py
+++ b/InvenTree/plugin/test_plugin.py
@@ -9,36 +9,10 @@ from django.test import TestCase
 from plugin.samples.integration.sample import SampleIntegrationPlugin
 from plugin.samples.integration.another_sample import WrongIntegrationPlugin, NoIntegrationPlugin
 import plugin.templatetags.plugin_extras as plugin_tags
-from plugin import registry, InvenTreePluginBase
+from plugin import registry, IntegrationPluginBase
 from plugin.plugin import IntegrationPluginBase
 
 
-class InvenTreePluginTests(TestCase):
-    """ Tests for InvenTreePlugin """
-    def setUp(self):
-        self.plugin = InvenTreePluginBase()
-
-        class NamedPlugin(InvenTreePluginBase):
-            """a named plugin"""
-            PLUGIN_NAME = 'abc123'
-
-        self.named_plugin = NamedPlugin()
-
-    def test_basic_plugin_init(self):
-        """check if a basic plugin intis"""
-        self.assertEqual(self.plugin.PLUGIN_NAME, '')
-        self.assertEqual(self.plugin.plugin_name(), '')
-
-    def test_basic_plugin_name(self):
-        """check if the name of a basic plugin can be set"""
-        self.assertEqual(self.named_plugin.PLUGIN_NAME, 'abc123')
-        self.assertEqual(self.named_plugin.plugin_name(), 'abc123')
-
-    def test_basic_is_active(self):
-        """check if a basic plugin is active"""
-        self.assertEqual(self.plugin.is_active(), False)
-
-
 class PluginTagTests(TestCase):
     """ Tests for the plugin extras """
 
@@ -90,6 +64,12 @@ class IntegrationPluginBaseTests(TestCase):
     def setUp(self):
         self.plugin = IntegrationPluginBase()
 
+        class NamedPlugin(IntegrationPluginBase):
+            """a named plugin"""
+            PLUGIN_NAME = 'abc123'
+
+        self.named_plugin = NamedPlugin()
+
         class SimpeIntegrationPluginBase(IntegrationPluginBase):
             PLUGIN_NAME = 'SimplePlugin'
 
@@ -109,6 +89,20 @@ class IntegrationPluginBaseTests(TestCase):
         self.plugin_name = NameIntegrationPluginBase()
         self.plugin_sample = SampleIntegrationPlugin()
 
+    def test_basic_plugin_init(self):
+        """check if a basic plugin intis"""
+        self.assertEqual(self.plugin.PLUGIN_NAME, '')
+        self.assertEqual(self.plugin.plugin_name(), '')
+
+    def test_basic_plugin_name(self):
+        """check if the name of a basic plugin can be set"""
+        self.assertEqual(self.named_plugin.PLUGIN_NAME, 'abc123')
+        self.assertEqual(self.named_plugin.plugin_name(), 'abc123')
+
+    def test_basic_is_active(self):
+        """check if a basic plugin is active"""
+        self.assertEqual(self.plugin.is_active(), False)
+
     def test_action_name(self):
         """check the name definition possibilities"""
         # plugin_name