Merge branch 'master' into add_request_files_to_post_comment

# Conflicts:
#	tests/testapp/tests/__init__.py

Author: DominicLGit

HISTORY.rst

@@ -6,9 +6,10 @@ History
 Unreleased
 ----------
 
-* Confirmed support for Django 4.1.
+* Confirmed support for Django 4.1 and 4.2.
+* Dropped support for Django < 3.2.
 * Confirmed support for Python 3.10.
-* Removed support for Python 3.6.
+* Dropped support for Python 3.6.
 
 2.2.0 (2022-01-31)
 ------------------

django_comments/compat.py

@@ -8,8 +8,7 @@
 from django.http import HttpResponseRedirect
 from django.shortcuts import render, resolve_url
 from django.core.exceptions import ObjectDoesNotExist
-
-from ..compat import url_has_allowed_host_and_scheme
+from django.utils.http import url_has_allowed_host_and_scheme
 
 import django_comments
 

django_comments/views/utils.py

@@ -23,12 +23,10 @@
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.0',
         'Framework :: Django :: 4.1',
+        'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'License :: OSI Approved :: BSD License',
@@ -43,5 +41,5 @@
     packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,
     test_suite='tests.runtests.main',
-    install_requires=['Django>=2.2']
+    install_requires=['Django>=3.2']
 )

setup.py

@@ -37,17 +37,5 @@
         "author" : 2,
         "headline" : "Dog Bites Man"
     }
-  },
-
-  {
-    "model" : "auth.user",
-    "pk" : 100,
-    "fields" : {
-        "username" : "normaluser",
-        "password" : "34ea4aaaf24efcbb4b30d27302f8657f",
-        "first_name": "Joe",
-        "last_name": "Normal",
-        "email": "[email protected]"
-    }
   }
 ]

tests/testapp/fixtures/comment_tests.json

@@ -17,7 +17,7 @@
 
 
 @override_settings(
-    PASSWORD_HASHERS=('django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',),
+    PASSWORD_HASHERS=('django.contrib.auth.hashers.MD5PasswordHasher',),
     ROOT_URLCONF='testapp.urls_default',
 )
 class CommentTestCase(TestCase):
@@ -26,6 +26,16 @@ class CommentTestCase(TestCase):
     """
     fixtures = ["comment_tests"]
 
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.user = User.objects.create(
+            username="normaluser",
+            first_name="Joe",
+            last_name="Normal",
+            email="[email protected]",
+        )
+
     def tearDown(self):
         super().tearDown()
         shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)

tests/testapp/tests/__init__.py

@@ -190,16 +190,15 @@ def testPostAsAuthenticatedUser(self):
         a = Article.objects.get(pk=1)
         data = self.getValidData(a)
         data['name'] = data['email'] = ''
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/post/", data, REMOTE_ADDR="1.2.3.4")
         self.assertEqual(response.status_code, 302)
         self.assertEqual(Comment.objects.count(), 1)
         c = Comment.objects.first()
         self.assertEqual(c.ip_address, "1.2.3.4")
-        u = User.objects.get(username='normaluser')
-        self.assertEqual(c.user, u)
-        self.assertEqual(c.user_name, u.get_full_name())
-        self.assertEqual(c.user_email, u.email)
+        self.assertEqual(c.user, self.user)
+        self.assertEqual(c.user_name, self.user.get_full_name())
+        self.assertEqual(c.user_email, self.user.email)
 
     def testPostAsAuthenticatedUserWithoutFullname(self):
         """

tests/testapp/tests/test_comment_views.py

@@ -15,15 +15,15 @@ def testFlagGet(self):
         """GET the flag view: render a confirmation page."""
         comments = self.createSomeComments()
         pk = comments[0].pk
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.get("/flag/%d/" % pk)
         self.assertTemplateUsed(response, "comments/flag.html")
 
     def testFlagPost(self):
         """POST the flag view: actually flag the view (nice for XHR)"""
         comments = self.createSomeComments()
         pk = comments[0].pk
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/flag/%d/" % pk)
         self.assertRedirects(response, "/flagged/?c=%d" % pk)
         c = Comment.objects.get(pk=pk)
@@ -36,7 +36,7 @@ def testFlagPostNext(self):
         """
         comments = self.createSomeComments()
         pk = comments[0].pk
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/flag/%d/" % pk, {'next': "/go/here/"})
         self.assertRedirects(response, "/go/here/?c=%d" % pk, fetch_redirect_response=False)
 
@@ -47,7 +47,7 @@ def testFlagPostUnsafeNext(self):
         """
         comments = self.createSomeComments()
         pk = comments[0].pk
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/flag/%d/" % pk,
             {'next': "http://elsewhere/bad"})
         self.assertRedirects(response, "/flagged/?c=%d" % pk)
@@ -119,7 +119,7 @@ def testDeletePermissions(self):
             fetch_redirect_response=False)
 
         # Test that we return forbidden if you're logged in but don't have access.
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.get("/delete/%d/" % pk)
         self.assertEqual(response.status_code, 403)
 
@@ -132,7 +132,7 @@ def testDeletePost(self):
         comments = self.createSomeComments()
         pk = comments[0].pk
         makeModerator("normaluser")
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/delete/%d/" % pk)
         self.assertRedirects(response, "/deleted/?c=%d" % pk)
         c = Comment.objects.get(pk=pk)
@@ -147,7 +147,7 @@ def testDeletePostNext(self):
         comments = self.createSomeComments()
         pk = comments[0].pk
         makeModerator("normaluser")
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/delete/%d/" % pk, {'next': "/go/here/"})
         self.assertRedirects(response, "/go/here/?c=%d" % pk, fetch_redirect_response=False)
 
@@ -159,7 +159,7 @@ def testDeletePostUnsafeNext(self):
         comments = self.createSomeComments()
         pk = comments[0].pk
         makeModerator("normaluser")
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/delete/%d/" % pk,
             {'next': "http://elsewhere/bad"})
         self.assertRedirects(response, "/deleted/?c=%d" % pk)
@@ -201,7 +201,7 @@ def testApprovePermissions(self):
         )
 
         # Test that we return forbidden if you're logged in but don't have access.
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.get("/approve/%d/" % pk)
         self.assertEqual(response.status_code, 403)
 
@@ -217,7 +217,7 @@ def testApprovePost(self):
         c1.save()
 
         makeModerator("normaluser")
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/approve/%d/" % c1.pk)
         self.assertRedirects(response, "/approved/?c=%d" % c1.pk)
         c = Comment.objects.get(pk=c1.pk)
@@ -234,7 +234,7 @@ def testApprovePostNext(self):
         c1.save()
 
         makeModerator("normaluser")
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/approve/%d/" % c1.pk,
             {'next': "/go/here/"})
         self.assertRedirects(response, "/go/here/?c=%d" % c1.pk, fetch_redirect_response=False)
@@ -249,7 +249,7 @@ def testApprovePostUnsafeNext(self):
         c1.save()
 
         makeModerator("normaluser")
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.post("/approve/%d/" % c1.pk,
             {'next': "http://elsewhere/bad"})
         self.assertRedirects(response, "/approved/?c=%d" % c1.pk)
@@ -278,37 +278,36 @@ def testApprovedView(self):
 @override_settings(ROOT_URLCONF='testapp.urls_admin')
 class AdminActionsTests(CommentTestCase):
 
-    def setUp(self):
-        super().setUp()
-
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
         # Make "normaluser" a moderator
-        u = User.objects.get(username="normaluser")
-        u.is_staff = True
+        cls.user.is_staff = True
         perms = Permission.objects.filter(
             content_type__app_label='django_comments',
             codename__endswith='comment'
         )
         for perm in perms:
-            u.user_permissions.add(perm)
-        u.save()
+            cls.user.user_permissions.add(perm)
+        cls.user.save()
 
     def testActionsNonModerator(self):
         self.createSomeComments()
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.get("/admin/django_comments/comment/")
         self.assertNotContains(response, "approve_comments")
 
     def testActionsModerator(self):
         self.createSomeComments()
         makeModerator("normaluser")
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.get("/admin/django_comments/comment/")
         self.assertContains(response, "approve_comments")
 
     def testActionsDisabledDelete(self):
         "Tests a CommentAdmin where 'delete_selected' has been disabled."
         self.createSomeComments()
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         response = self.client.get('/admin2/django_comments/comment/')
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, '<option value="delete_selected">')
@@ -329,7 +328,7 @@ def testActionsMessageTranslations(self):
         one_comment = c1.pk
         many_comments = [c2.pk, c3.pk, c4.pk]
         makeModerator("normaluser")
-        self.client.login(username="normaluser", password="normaluser")
+        self.client.force_login(self.user)
         with translation.override('en'):
             # Test approving
             self.performActionAndCheckMessage('approve_comments', one_comment,

tests/testapp/tests/test_moderation_views.py

@@ -1,11 +1,9 @@
 [tox]
 envlist =
-    py3{7,8,9}-django22
-    py3{7,8,9}-django30
-    py3{7,8,9}-django31
     py3{7,8,9,10}-django32
     py3{8,9,10}-django40
     py3{8,9,10}-django41
+    py3{8,9,10}-django42
     py3{8,9,10}-main
 
 [testenv]
@@ -18,10 +16,8 @@ commands = {envpython} setup.py test
 setenv=
   PYTHONWARNINGS=default
 deps=
-    django-22: Django>=2.2a1,<3.0
-    django-30: Django>=3.0a1,<3.1
-    django-31: Django>=3.1a1,<3.2
     django-32: Django>=3.2a1,<4.0
     django-40: Django>=4.0a1,<4.1
     django-41: Django>=4.1a1,<4.2
+    django-42: Django>=4.2a1,<5.0
     django-main: https://github.com/django/django/archive/main.tar.gz