fixed regression where overridden mixin methods are not called (#1315)

.github/workflows/django-import-export-ci.yml

@@ -1,6 +1,12 @@
 name: django-import-export CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
 
 jobs:
   test:

import_export/mixins.py

@@ -26,7 +26,7 @@ def get_import_resource_class(self):
         """
         Returns ResourceClass to use for import.
         """
-        return super().get_resource_class()
+        return self.get_resource_class()
 
     def get_import_formats(self):
         """
@@ -35,7 +35,7 @@ def get_import_formats(self):
         return [f for f in self.formats if f().can_import()]
 
     def get_import_resource_kwargs(self, request, *args, **kwargs):
-        return super().get_resource_kwargs(request, *args, **kwargs)
+        return self.get_resource_kwargs(request, *args, **kwargs)
 
 
 class BaseExportMixin(BaseImportExportMixin):
@@ -51,10 +51,10 @@ def get_export_resource_class(self):
         """
         Returns ResourceClass to use for export.
         """
-        return super().get_resource_class()
+        return self.get_resource_class()
 
     def get_export_resource_kwargs(self, request, *args, **kwargs):
-        return super().get_resource_kwargs(request, *args, **kwargs)
+        return self.get_resource_kwargs(request, *args, **kwargs)
 
     def get_data_for_export(self, request, queryset, *args, **kwargs):
         resource_class = self.get_export_resource_class()

tests/core/tests/test_mixins.py

@@ -87,6 +87,7 @@ def get_filterset_class(self):
 
 
 class BaseImportMixinTest(TestCase):
+
     def test_get_import_formats(self):
         class Format(object):
             def __init__(self, id, can_import):
@@ -112,6 +113,53 @@ def __init__(self):
         self.assertEqual('CanImportFormat', formats[0].__name__)
 
 
+class MixinModelAdminTest(TestCase):
+    """
+    Tests for regression where methods in ModelAdmin with BaseImportMixin / BaseExportMixin
+    do not get called.
+    see #1315.
+    """
+    request = MagicMock(spec=HttpRequest)
+
+    class BaseImportModelAdminTest(mixins.BaseImportMixin):
+        call_count = 0
+
+        def get_resource_class(self):
+            self.call_count += 1
+
+        def get_resource_kwargs(self, request, *args, **kwargs):
+            self.call_count += 1
+
+    class BaseExportModelAdminTest(mixins.BaseExportMixin):
+        call_count = 0
+
+        def get_resource_class(self):
+            self.call_count += 1
+
+        def get_resource_kwargs(self, request, *args, **kwargs):
+            self.call_count += 1
+
+    def test_get_import_resource_class_calls_self_get_resource_class(self):
+        admin = self.BaseImportModelAdminTest()
+        admin.get_import_resource_class()
+        self.assertEqual(1, admin.call_count)
+
+    def test_get_import_resource_kwargs_calls_self_get_resource_kwargs(self):
+        admin = self.BaseImportModelAdminTest()
+        admin.get_import_resource_kwargs(self.request)
+        self.assertEqual(1, admin.call_count)
+
+    def test_get_export_resource_class_calls_self_get_resource_class(self):
+        admin = self.BaseExportModelAdminTest()
+        admin.get_export_resource_class()
+        self.assertEqual(1, admin.call_count)
+
+    def test_get_export_resource_kwargs_calls_self_get_resource_kwargs(self):
+        admin = self.BaseExportModelAdminTest()
+        admin.get_export_resource_kwargs(self.request)
+        self.assertEqual(1, admin.call_count)
+
+
 class BaseExportMixinTest(TestCase):
     class TestBaseExportMixin(mixins.BaseExportMixin):
         def get_export_resource_kwargs(self, request, *args, **kwargs):