Fix django-1.6 incompatibilities

[patchwork] / apps / patchwork / tests / mail_settings.py

diff --git a/apps/patchwork/tests/mail_settings.py b/apps/patchwork/tests/mail_settings.py
index 36dc5cc3a19dcfdadb0a93425355f9eb9d8c432a..a193c9711375920d08a27fc131e6816f31b2a0ce 100644 (file)
--- a/apps/patchwork/tests/mail_settings.py
+++ b/apps/patchwork/tests/mail_settings.py
@@ -25,7 +25,7 @@ from django.core import mail
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from patchwork.models import EmailOptout, EmailConfirmation, Person
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from patchwork.models import EmailOptout, EmailConfirmation, Person

-from patchwork.tests.utils import create_user
+from patchwork.tests.utils import create_user, error_strings

 
 class MailSettingsTest(TestCase):
     view = 'patchwork.views.mail.settings'
 
 class MailSettingsTest(TestCase):
     view = 'patchwork.views.mail.settings'


@@ -54,8 +54,7 @@ class MailSettingsTest(TestCase):
         response = self.client.post(self.url, {'email': 'foo'})
         self.assertEquals(response.status_code, 200)
         self.assertTemplateUsed(response, 'patchwork/mail-form.html')
         response = self.client.post(self.url, {'email': 'foo'})
         self.assertEquals(response.status_code, 200)
         self.assertTemplateUsed(response, 'patchwork/mail-form.html')

-        self.assertFormError(response, 'form', 'email',
-                'Enter a valid e-mail address.')
+        self.assertFormError(response, 'form', 'email', error_strings['email'])

 
     def testMailSettingsPOSTOptedIn(self):
         email = u'foo@example.com'
 
     def testMailSettingsPOSTOptedIn(self):
         email = u'foo@example.com'


@@ -119,8 +118,7 @@ class OptoutRequestTest(TestCase):
     def testOptoutRequestInvalidPOSTNonEmail(self):
         response = self.client.post(self.url, {'email': 'foo'})
         self.assertEquals(response.status_code, 200)
     def testOptoutRequestInvalidPOSTNonEmail(self):
         response = self.client.post(self.url, {'email': 'foo'})
         self.assertEquals(response.status_code, 200)

-        self.assertFormError(response, 'form', 'email',
-                'Enter a valid e-mail address.')
+        self.assertFormError(response, 'form', 'email', error_strings['email'])

         self.assertTrue(response.context['error'])
         self.assertTrue('email_sent' not in response.context)
         self.assertEquals(len(mail.outbox), 0)
         self.assertTrue(response.context['error'])
         self.assertTrue('email_sent' not in response.context)
         self.assertEquals(len(mail.outbox), 0)


@@ -202,8 +200,7 @@ class OptinRequestTest(TestCase):
     def testOptoutRequestInvalidPOSTNonEmail(self):
         response = self.client.post(self.url, {'email': 'foo'})
         self.assertEquals(response.status_code, 200)
     def testOptoutRequestInvalidPOSTNonEmail(self):
         response = self.client.post(self.url, {'email': 'foo'})
         self.assertEquals(response.status_code, 200)

-        self.assertFormError(response, 'form', 'email',
-                'Enter a valid e-mail address.')
+        self.assertFormError(response, 'form', 'email', error_strings['email'])

         self.assertTrue(response.context['error'])
         self.assertTrue('email_sent' not in response.context)
         self.assertEquals(len(mail.outbox), 0)
         self.assertTrue(response.context['error'])
         self.assertTrue('email_sent' not in response.context)
         self.assertEquals(len(mail.outbox), 0)


@@ -296,7 +293,7 @@ class UserProfileOptoutFormTest(TestCase):
         p.save()
         EmailOptout(email = p.email).save()
 
         p.save()
         EmailOptout(email = p.email).save()
 

-        form_re = self._form_re(self.optin_url, self.user.email)
+        form_re = self._form_re(self.optin_url, p.email)

         response = self.client.get(self.url)
         self.assertEquals(response.status_code, 200)
         self.assertTrue(form_re.search(response.content) is not None)
         response = self.client.get(self.url)
         self.assertEquals(response.status_code, 200)
         self.assertTrue(form_re.search(response.content) is not None)