search_fields = ('name', 'submitter__name', 'submitter__email')
date_hierarchy = 'date'
admin.site.register(Submission, SubmissionAdmin)
-
-
-CoverLetterAdmin = SubmissionAdmin
-admin.site.register(CoverLetter, CoverLetterAdmin)
+admin.site.register(CoverLetter, SubmissionAdmin)
class PatchAdmin(admin.ModelAdmin):
if django.VERSION < (1, 8):
- HashFieldBase = six.with_metaclass(models.SubfieldBase, models.CharField)
+ HashFieldBase = six.with_metaclass(models.SubfieldBase,
+ models.CharField) # noqa
else:
HashFieldBase = models.CharField
class EmailForm(forms.Form):
email = forms.EmailField(max_length=200)
-
-UserPersonLinkForm = EmailForm
-OptinoutRequestForm = EmailForm
from __future__ import absolute_import
-import datetime
+from datetime import datetime as dt
import re
from django.core.urlresolvers import reverse
class PatchOrderTest(TestCase):
- d = datetime.datetime
patchmeta = [
('AlCMyjOsx', 'AlxMyjOsx@nRbqkQV.wBw',
- d(2014, 3, 16, 13, 4, 50, 155643)),
+ dt(2014, 3, 16, 13, 4, 50, 155643)),
('MMZnrcDjT', 'MMmnrcDjT@qGaIfOl.tbk',
- d(2014, 1, 25, 13, 4, 50, 162814)),
+ dt(2014, 1, 25, 13, 4, 50, 162814)),
('WGirwRXgK', 'WGSrwRXgK@TriIETY.GhE',
- d(2014, 2, 14, 13, 4, 50, 169305)),
+ dt(2014, 2, 14, 13, 4, 50, 169305)),
('isjNIuiAc', 'issNIuiAc@OsEirYx.EJh',
- d(2014, 3, 15, 13, 4, 50, 176264)),
+ dt(2014, 3, 15, 13, 4, 50, 176264)),
('XkAQpYGws', 'XkFQpYGws@hzntTcm.JSE',
- d(2014, 1, 18, 13, 4, 50, 182493)),
+ dt(2014, 1, 18, 13, 4, 50, 182493)),
('uJuCPWMvi', 'uJACPWMvi@AVRBOBl.ecy',
- d(2014, 3, 12, 13, 4, 50, 189554)),
+ dt(2014, 3, 12, 13, 4, 50, 189554)),
('TyQmWtcbg', 'TylmWtcbg@DzrNeNH.JuB',
- d(2014, 2, 3, 13, 4, 50, 195685)),
+ dt(2014, 2, 3, 13, 4, 50, 195685)),
('FpvAhWRdX', 'FpKAhWRdX@agxnCAI.wFO',
- d(2014, 3, 15, 13, 4, 50, 201398)),
+ dt(2014, 3, 15, 13, 4, 50, 201398)),
('bmoYvnyWa', 'bmdYvnyWa@aeoPnlX.juy',
- d(2014, 3, 4, 13, 4, 50, 206800)),
+ dt(2014, 3, 4, 13, 4, 50, 206800)),
('CiReUQsAq', 'CiieUQsAq@DnOYRuf.TTI',
- d(2014, 3, 28, 13, 4, 50, 212169)),
+ dt(2014, 3, 28, 13, 4, 50, 212169)),
]
def setUp(self):
class TestUser(object):
firstname = 'Test'
lastname = 'User'
+ fullname = ' '.join([firstname, lastname])
username = 'testuser'
email = 'test@example.com'
password = 'foobar'
self.required_error = 'This field is required.'
self.invalid_error = 'Enter a valid value.'
- def testRegistrationForm(self):
+ def test_registration_form(self):
response = self.client.get('/register/')
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'patchwork/registration_form.html')
- def testBlankFields(self):
+ def test_blank_fields(self):
for field in ['username', 'email', 'password']:
data = self.default_data.copy()
del data[field]
self.assertEqual(response.status_code, 200)
self.assertFormError(response, 'form', field, self.required_error)
- def testInvalidUsername(self):
+ def test_invalid_username(self):
data = self.default_data.copy()
data['username'] = 'invalid user'
response = self.client.post('/register/', data)
self.assertEqual(response.status_code, 200)
self.assertFormError(response, 'form', 'username', self.invalid_error)
- def testExistingUsername(self):
+ def test_existing_username(self):
user = create_user()
data = self.default_data.copy()
data['username'] = user.username
'This username is already taken. Please choose '
'another.')
- def testExistingEmail(self):
+ def test_existing_email(self):
user = create_user()
data = self.default_data.copy()
data['email'] = user.email
'This email address is already in use '
'for the account "%s".\n' % user.username)
- def testValidRegistration(self):
+ def test_valid_registration(self):
response = self.client.post('/register/', self.default_data)
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'confirmation email has been sent')
def setUp(self):
self.user = TestUser()
- self.default_data = {'username': self.user.username,
- 'first_name': self.user.firstname,
- 'last_name': self.user.lastname,
- 'email': self.user.email,
- 'password': self.user.password}
-
- def testRegistrationConfirmation(self):
+ self.default_data = {
+ 'username': self.user.username,
+ 'first_name': self.user.firstname,
+ 'last_name': self.user.lastname,
+ 'email': self.user.email,
+ 'password': self.user.password
+ }
+
+ def test_valid(self):
self.assertEqual(EmailConfirmation.objects.count(), 0)
response = self.client.post('/register/', self.default_data)
self.assertEqual(response.status_code, 200)
self.assertTrue(conf.user.is_active)
self.assertFalse(conf.active)
- def testRegistrationNewPersonSetup(self):
- """ Check that the person object created after registration has the
- correct details """
-
+ def test_new_person_setup(self):
+ """Check that the person object created after registration has the
+ correct details."""
# register
self.assertEqual(EmailConfirmation.objects.count(), 0)
response = self.client.post('/register/', self.default_data)
self.assertTrue(qs.exists())
person = Person.objects.get(email=self.user.email)
- self.assertEqual(person.name,
- self.user.firstname + ' ' + self.user.lastname)
+ self.assertEqual(person.name, self.user.fullname)
- def testRegistrationExistingPersonSetup(self):
+ def test_existing_person_setup(self):
""" Check that the person object created after registration has the
correct details """
-
- fullname = self.user.firstname + ' ' + self.user.lastname
- person = Person(name=fullname, email=self.user.email)
+ person = Person(name=self.user.fullname, email=self.user.email)
person.save()
# register
person = Person.objects.get(email=self.user.email)
- self.assertEqual(person.name, fullname)
-
- def testRegistrationExistingPersonUnmodified(self):
- """ Check that an unconfirmed registration can't modify an existing
- Person object"""
+ self.assertEqual(person.name, self.user.fullname)
- fullname = self.user.firstname + ' ' + self.user.lastname
- person = Person(name=fullname, email=self.user.email)
+ def test_existing_person_unmodified(self):
+ """Check that an unconfirmed registration can't modify an existing
+ Person object."""
+ person = Person(name=self.user.fullname, email=self.user.email)
person.save()
# register
response = self.client.post('/register/', data)
self.assertEqual(response.status_code, 200)
- self.assertEqual(Person.objects.get(pk=person.pk).name, fullname)
+ self.assertEqual(Person.objects.get(pk=person.pk).name,
+ self.user.fullname)
else:
# stub out APITestCase
from django.test import TestCase
- APITestCase = TestCase
+ APITestCase = TestCase # noqa
@unittest.skipUnless(settings.ENABLE_REST_API, 'requires ENABLE_REST_API')
from django.shortcuts import render
from patchwork.compat import render_to_string
-from patchwork.forms import OptinoutRequestForm, EmailForm
-from patchwork.models import EmailOptout, EmailConfirmation
+from patchwork.forms import EmailForm
+from patchwork.models import EmailConfirmation
+from patchwork.models import EmailOptout
def settings(request):
if request.method != 'POST':
return HttpResponseRedirect(reverse(settings))
- form = OptinoutRequestForm(data=request.POST)
+ form = EmailForm(data=request.POST)
if not form.is_valid():
context['error'] = ('There was an error in the %s form. Please '
'review the form and re-submit.' % description)
from patchwork.compat import render_to_string
from patchwork.filters import DelegateFilter
-from patchwork.forms import (UserProfileForm, UserPersonLinkForm,
- RegistrationForm)
-from patchwork.models import (Project, Bundle, Person, EmailConfirmation,
- State, EmailOptout)
+from patchwork.forms import EmailForm
+from patchwork.forms import RegistrationForm
+from patchwork.forms import UserProfileForm
+from patchwork.models import Bundle
+from patchwork.models import EmailConfirmation
+from patchwork.models import EmailOptout
+from patchwork.models import Person
+from patchwork.models import Project
+from patchwork.models import State
from patchwork.views import generic_list
people = Person.objects.filter(user=request.user) \
.extra(select={'is_optout': optout_query})
context['linked_emails'] = people
- context['linkform'] = UserPersonLinkForm()
+ context['linkform'] = EmailForm()
return render(request, 'patchwork/profile.html', context)
context = {}
if request.method == 'POST':
- form = UserPersonLinkForm(request.POST)
+ form = EmailForm(request.POST)
if form.is_valid():
conf = EmailConfirmation(type='userperson',
user=request.user,
context['error'] = ('An error occurred during confirmation. '
'Please try again later')
else:
- form = UserPersonLinkForm()
+ form = EmailForm()
context['linkform'] = form
projects / thirdparty / patchwork.git / commitdiff
