Peripheral: Update what we test against (#19)

* Peripheral: Update what we test against

* Peripheral: Update what we test against

* Peripheral: Add tests for basic contact form

* Peripheral: Change inheritance

* Update CHANGELOG.md

Author: madisona

.github/workflows/django.yml

@@ -14,13 +14,23 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
-        django-version: ['2.2', '3.2', '4.0']
+        python-version: ['3.10', '3.11', '3.12']
+        django-version: ['4.2', '5.2']
         include:
-          - python-version: '3.7'
+          - python-version: '3.8'
             django-version: '2.2'
-          - python-version: '3.7'
+          - python-version: '3.8'
             django-version: '3.2'
+          - python-version: '3.8'
+            django-version: '4.2'
+          - python-version: '3.9'
+            django-version: '3.2'
+          - python-version: '3.9'
+            django-version: '4.2'
+          - python-version: '3.10'
+            django-version: '3.2'
+          - python-version: '3.13'
+            django-version: '5.2'
 
     steps:
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -0,0 +1,4 @@
+## [0.9.0] - 2025-04-07
+- Added: Django 5.2 support
+- Added: Python 3.13 support
+- Bug Fix: Fix Inheritance order with Django 4.2 and 5.2

contact_form/__init__.py

@@ -1,2 +1,2 @@
 
-VERSION = '0.8.0'
+VERSION = '0.9.0'

contact_form/forms.py

@@ -79,13 +79,13 @@ def send_email(self, request, fail_silently=False):
             fail_silently=fail_silently)
 
 
-class ContactForm(forms.Form, BaseEmailFormMixin):
+class ContactForm(BaseEmailFormMixin, forms.Form):
     """
     Subclass this and declare your own fields.
     """
 
 
-class ContactModelForm(forms.ModelForm, BaseEmailFormMixin):
+class ContactModelForm(BaseEmailFormMixin, forms.ModelForm):
     """
     You'll need to declare the model yourself.
     """

contact_form/templates/contact_form/email_template.txt

@@ -1,6 +1,6 @@
 {% load i18n %}{% trans "Hi there," %}
 
-{% trans "You have receive a contact request." %}
+{% trans "You have received a contact request." %}
 
 {% trans "Name:" %} {{ name }}
 {% trans "Email:" %} {{ email }}

contact_form/tests.py

@@ -49,23 +49,22 @@ def get_email_headers(self):
 
 
 class BaseEmailFormMixinTests(test.TestCase):
-    @mock.patch('django.template.loader.render_to_string')
-    def test_get_message_returns_rendered_message_template(
-            self, render_to_string):
-        context = {'message': 'an example message.'}
+
+    def test_get_message_returns_rendered_message_template(self):
+        context = {'body': 'an example message.', "name": "tester", "email": "a@b.com"}
 
         class TestForm(forms.BaseEmailFormMixin):
-            message_template_name = "my_template.html"
+            message_template_name = "contact_form/email_template.txt"
 
             def get_context(self):
                 return context
 
         form = TestForm()
 
         message = form.get_message()
-        self.assertEqual(render_to_string.return_value, message)
-        render_to_string.assert_called_once_with(form.message_template_name,
-                                                 context)
+        self.assertIn("an example message.", message)
+        self.assertIn("a@b.com", message)
+        self.assertIn("tester", message)
 
     @mock.patch('django.template.loader.render_to_string')
     def test_get_subject_returns_single_line_rendered_subject_template(
@@ -238,3 +237,22 @@ def test_has_valid_message_template(self):
             template_exists = 0
         self.assertTrue(template_exists,
                         "Email message template does not exist")
+
+
+class BasicContactFormTests(test.TestCase):
+
+    def test_basic_contact_form_get_message_dict_shows_rendered_template_values(self):
+        form = forms.BasicContactForm(data={"name": "Tester", "email": "a@b.com", "body": "Contact Me!"})
+        form.request = test.RequestFactory().get("/")
+        message_dict = form.get_message_dict()
+
+        self.assertIn("Contact Me!", message_dict['body'])
+        self.assertIn("Tester", message_dict['body'])
+        self.assertIn("a@b.com", message_dict['body'])
+
+    def test_basic_contact_form_get_message_dict_shows_subject_from_template(self):
+        form = forms.BasicContactForm(data={"name": "Tester", "email": "a@b.com", "body": "Contact Me!"})
+        form.request = test.RequestFactory().get("/")
+        message_dict = form.get_message_dict()
+
+        self.assertIn("Contact request received", message_dict['subject'])

setup.py

@@ -26,18 +26,20 @@
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Django",
-        "Framework :: Django :: 1.11",
-        "Framework :: Django :: 2.0",
-        "Framework :: Django :: 2.1",
         "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.2",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Software Development",
         "Topic :: Software Development :: Libraries :: Application Frameworks",
     ],