Rafał Pitoń 6 лет назад
Родитель
Сommit
6d89a539bb

+ 0 - 2
misago/core/testproject/urls.py

@@ -29,8 +29,6 @@ urlpatterns = [
         ),
         name='django-i18n'
     ),
-    url(r'^forum/test-mail-user/$', views.test_mail_user, name='test-mail-user'),
-    url(r'^forum/test-mail-users/$', views.test_mail_users, name='test-mail-users'),
     url(r'^forum/test-pagination/$', views.test_pagination, name='test-pagination'),
     url(
         r'^forum/test-pagination/(?P<page>[1-9][0-9]*)/$',

+ 1 - 20
misago/core/testproject/views.py

@@ -1,12 +1,11 @@
 from rest_framework.decorators import api_view
 
-from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponse
 from social_core.exceptions import AuthFailed, NotAllowedToDisconnect, WrongBackend
 from social_core.backends.github import GithubOAuth2
 
-from misago.core import errorpages, mail
+from misago.core import errorpages
 from misago.core.decorators import require_POST
 from misago.core.exceptions import Banned, SocialAuthBanned, SocialAuthFailed
 from misago.core.shortcuts import paginate, paginated_response, validate_slug
@@ -17,24 +16,6 @@ from .models import Model
 from .serializers import MockSerializer
 
 
-UserModel = get_user_model()
-
-
-def test_mail_user(request):
-    test_user = UserModel.objects.all().first()
-    mail.mail_user(test_user, "Misago Test Mail", "misago/emails/base")
-
-    return HttpResponse("Mailed user!")
-
-
-def test_mail_users(request):
-    mail.mail_users(
-        UserModel.objects.iterator(), "Misago Test Spam", "misago/emails/base"
-    )
-
-    return HttpResponse("Mailed users!")
-
-
 def test_pagination(request, page=None):
     items = range(15)
     page = paginate(items, page, 5)

+ 0 - 47
misago/core/tests/test_mailer.py

@@ -1,47 +0,0 @@
-from django.contrib.auth import get_user_model
-from django.core import mail
-from django.test import TestCase, override_settings
-from django.urls import reverse
-
-
-UserModel = get_user_model()
-
-
-@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
-class MisagoMailerTests(TestCase):
-    def test_mail_user(self):
-        """mail_user sets message in backend"""
-        #fixme: nuke test view for mailing users!
-        user = UserModel.objects.create_user('Bob', 'bob@bob.com', 'pass123')
-
-        response = self.client.get(reverse('test-mail-user'))
-        self.assertEqual(response.status_code, 200)
-
-        self.assertEqual(mail.outbox[0].subject, "Misago Test Mail")
-
-        # assert that url to user's avatar is valid
-        html_body = mail.outbox[0].alternatives[0][0]
-        user_avatar_url = reverse('misago:user-avatar', kwargs={'pk': user.pk, 'size': 32})
-
-        self.assertIn(user_avatar_url, html_body)
-
-    def test_mail_users(self):
-        """mail_users sets messages in backend"""
-        #fixme: nuke test view for mailing users!
-        test_users = (
-            UserModel.objects.create_user('Alpha', 'alpha@test.com', 'pass123'),
-            UserModel.objects.create_user('Beta', 'beta@test.com', 'pass123'),
-            UserModel.objects.create_user('Niner', 'niner@test.com', 'pass123'),
-            UserModel.objects.create_user('Foxtrot', 'foxtrot@test.com', 'pass123'),
-            UserModel.objects.create_user('Uniform', 'uniform@test.com', 'pass123'),
-        )
-
-        response = self.client.get(reverse('test-mail-users'))
-        self.assertEqual(response.status_code, 200)
-
-        spams_sent = 0
-        for message in mail.outbox:
-            if message.subject == 'Misago Test Spam':
-                spams_sent += 1
-
-        self.assertEqual(spams_sent, len(test_users))