Browse Source

Replace RequestMock with unittest.mocks.Mock

rafalp 6 years ago
parent
commit
26cc404b06
1 changed files with 11 additions and 14 deletions
  1. 11 14
      misago/threads/tests/test_attachments_middleware.py

+ 11 - 14
misago/threads/tests/test_attachments_middleware.py

@@ -1,3 +1,5 @@
+from unittest.mock import Mock
+
 from rest_framework import serializers
 from rest_framework import serializers
 
 
 from misago.acl import useracl
 from misago.acl import useracl
@@ -11,11 +13,6 @@ from misago.threads.api.postingendpoint.attachments import (
 from misago.threads.models import Attachment, AttachmentType
 from misago.threads.models import Attachment, AttachmentType
 from misago.users.testutils import AuthenticatedUserTestCase
 from misago.users.testutils import AuthenticatedUserTestCase
 
 
-
-class RequestMock(object):
-    def __init__(self, data=None):
-        self.data = data or {}
-
 cache_versions = {"acl": "abcdefgh"}
 cache_versions = {"acl": "abcdefgh"}
 
 
 
 
@@ -70,7 +67,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
 
 
         for test_input in INPUTS:
         for test_input in INPUTS:
             middleware = AttachmentsMiddleware(
             middleware = AttachmentsMiddleware(
-                request=RequestMock(test_input),
+                request=Mock(data=test_input),
                 mode=PostingEndpoint.START,
                 mode=PostingEndpoint.START,
                 user=self.user,
                 user=self.user,
                 user_acl=user_acl,
                 user_acl=user_acl,
@@ -89,7 +86,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
 
 
         for test_input in INPUTS:
         for test_input in INPUTS:
             middleware = AttachmentsMiddleware(
             middleware = AttachmentsMiddleware(
-                request=RequestMock({
+                request=Mock(data={
                     'attachments': test_input
                     'attachments': test_input
                 }),
                 }),
                 mode=PostingEndpoint.START,
                 mode=PostingEndpoint.START,
@@ -106,7 +103,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
         """get_initial_attachments returns list of attachments already existing on post"""
         """get_initial_attachments returns list of attachments already existing on post"""
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         middleware = AttachmentsMiddleware(
         middleware = AttachmentsMiddleware(
-            request=RequestMock(),
+            request=Mock(data={}),
             mode=PostingEndpoint.EDIT,
             mode=PostingEndpoint.EDIT,
             user=self.user,
             user=self.user,
             user_acl=user_acl,
             user_acl=user_acl,
@@ -131,7 +128,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
         """get_initial_attachments returns list of attachments already existing on post"""
         """get_initial_attachments returns list of attachments already existing on post"""
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         middleware = AttachmentsMiddleware(
         middleware = AttachmentsMiddleware(
-            request=RequestMock(),
+            request=Mock(data={}),
             mode=PostingEndpoint.EDIT,
             mode=PostingEndpoint.EDIT,
             user=self.user,
             user=self.user,
             user_acl=user_acl,
             user_acl=user_acl,
@@ -161,7 +158,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
 
 
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         serializer = AttachmentsMiddleware(
         serializer = AttachmentsMiddleware(
-            request=RequestMock({
+            request=Mock(data={
                 'attachments': []
                 'attachments': []
             }),
             }),
             mode=PostingEndpoint.EDIT,
             mode=PostingEndpoint.EDIT,
@@ -182,7 +179,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
 
 
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         middleware = AttachmentsMiddleware(
         middleware = AttachmentsMiddleware(
-            request=RequestMock({
+            request=Mock(data={
                 'attachments': [a.pk for a in attachments]
                 'attachments': [a.pk for a in attachments]
             }),
             }),
             mode=PostingEndpoint.EDIT,
             mode=PostingEndpoint.EDIT,
@@ -213,7 +210,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
 
 
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         middleware = AttachmentsMiddleware(
         middleware = AttachmentsMiddleware(
-            request=RequestMock({
+            request=Mock(data={
                 'attachments': [attachments[0].pk]
                 'attachments': [attachments[0].pk]
             }),
             }),
             mode=PostingEndpoint.EDIT,
             mode=PostingEndpoint.EDIT,
@@ -248,7 +245,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
 
 
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         middleware = AttachmentsMiddleware(
         middleware = AttachmentsMiddleware(
-            request=RequestMock({
+            request=Mock(data={
                 'attachments': [attachments[0].pk, attachments[1].pk]
                 'attachments': [attachments[0].pk, attachments[1].pk]
             }),
             }),
             mode=PostingEndpoint.EDIT,
             mode=PostingEndpoint.EDIT,
@@ -279,7 +276,7 @@ class AttachmentsMiddlewareTests(AuthenticatedUserTestCase):
 
 
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         user_acl = useracl.get_user_acl(self.user, cache_versions)
         middleware = AttachmentsMiddleware(
         middleware = AttachmentsMiddleware(
-            request=RequestMock({
+            request=Mock(data={
                 'attachments': [attachments[0].pk, attachments[2].pk]
                 'attachments': [attachments[0].pk, attachments[2].pk]
             }),
             }),
             mode=PostingEndpoint.EDIT,
             mode=PostingEndpoint.EDIT,