Skip to content

Commit

Permalink
Fix Pep8 errors
Browse files Browse the repository at this point in the history
  • Loading branch information
SemVerTsar committed Oct 29, 2014
1 parent 54fb754 commit cd6745c
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 14 deletions.
65 changes: 53 additions & 12 deletions user_management/api/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,21 @@ def tearDown(self):
def test_post(self):
username = 'Test@example.com'
password = 'myepicstrongpassword'
UserFactory.create(email=username.lower(), password=password, is_active=True)
UserFactory.create(
email=username.lower(),
password=password,
is_active=True,
)

data = {'username': username, 'password': password}
request = self.create_request('post', auth=False, data=data)
view = self.view_class.as_view()
response = view(request)
self.assertEqual(response.status_code, status.HTTP_200_OK, msg=response.data)
self.assertEqual(
response.status_code,
status.HTTP_200_OK,
msg=response.data,
)

def test_post_username(self):
username = 'Test@example.com'
Expand All @@ -49,7 +57,11 @@ def test_post_username(self):
request = self.create_request('post', auth=False, data=data)
view = self.view_class.as_view()
response = view(request)
self.assertEqual(response.status_code, status.HTTP_200_OK, msg=response.data)
self.assertEqual(
response.status_code,
status.HTTP_200_OK,
msg=response.data,
)

def test_delete(self):
user = UserFactory.create()
Expand Down Expand Up @@ -153,7 +165,9 @@ def test_unauthenticated_user_post(self):
@patch('user_management.api.serializers.RegistrationSerializer.Meta.model',
new=BasicUser)
def test_unauthenticated_user_post_no_verify_email(self):
"""An email should not be sent if email_verification_required is False."""
"""
An email should not be sent if email_verification_required is False.
"""
request = self.create_request('post', auth=False, data=self.data)

response = self.view_class.as_view()(request)
Expand Down Expand Up @@ -210,7 +224,11 @@ def test_existent_email(self):
email = 'exists@example.com'
user = UserFactory.create(email=email)

request = self.create_request('post', data={'email': email}, auth=False)
request = self.create_request(
'post',
data={'email': email},
auth=False,
)
view = self.view_class.as_view()
with patch.object(self.view_class, 'send_email') as send_email:
response = view(request)
Expand All @@ -228,7 +246,11 @@ def test_non_existent_email(self):
email = 'doesnotexist@example.com'
UserFactory.create(email='exists@example.com')

request = self.create_request('post', data={'email': email}, auth=False)
request = self.create_request(
'post',
data={'email': email},
auth=False,
)
view = self.view_class.as_view()
with patch.object(self.view_class, 'send_email') as send_email:
response = view(request)
Expand Down Expand Up @@ -261,7 +283,9 @@ def test_send_email(self):
self.assertIn('https://', sent_mail.body)

def test_options(self):
"""Ensure information about email field is included in options request"""
"""
Ensure information about email field is included in options request.
"""
request = self.create_request('options', auth=False)
view = self.view_class.as_view()
response = view(request)
Expand Down Expand Up @@ -360,7 +384,10 @@ def test_password_mismatch(self):

request = self.create_request(
'put',
data={'new_password': new_password, 'new_password2': invalid_password},
data={
'new_password': new_password,
'new_password2': invalid_password,
},
auth=False,
)
view = self.view_class.as_view()
Expand Down Expand Up @@ -674,7 +701,10 @@ class TestUserList(APIRequestTestCase):
view_class = views.UserList

def expected_data(self, user):
url = reverse('user_management_api:user_detail', kwargs={'pk': user.pk})
url = reverse(
'user_management_api:user_detail',
kwargs={'pk': user.pk},
)
expected = {
'url': TEST_SERVER + url,
'name': user.name,
Expand Down Expand Up @@ -734,7 +764,10 @@ def setUp(self):
self.user, self.other_user = UserFactory.create_batch(2)

def expected_data(self, user):
url = reverse('user_management_api:user_detail', kwargs={'pk': user.pk})
url = reverse(
'user_management_api:user_detail',
kwargs={'pk': user.pk},
)
expected = {
'url': TEST_SERVER + url,
'name': user.name,
Expand Down Expand Up @@ -787,7 +820,11 @@ def test_put(self):
view = self.view_class.as_view()

response = view(request, pk=self.other_user.pk)
self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
self.assertEqual(
response.status_code,
status.HTTP_200_OK,
response.data,
)

user = User.objects.get(pk=self.other_user.pk)
self.assertEqual(user.name, data['name'])
Expand All @@ -803,7 +840,11 @@ def test_patch(self):
view = self.view_class.as_view()

response = view(request, pk=self.other_user.pk)
self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
self.assertEqual(
response.status_code,
status.HTTP_200_OK,
response.data,
)

user = User.objects.get(pk=self.other_user.pk)
self.assertEqual(user.name, data['name'])
Expand Down
11 changes: 9 additions & 2 deletions user_management/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ class UserRegister(generics.CreateAPIView):
permission_classes = [permissions.IsNotAuthenticated]

def create(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.DATA, files=request.FILES)
serializer = self.get_serializer(
data=request.DATA,
files=request.FILES,
)
if serializer.is_valid():
return self.is_valid(serializer)
return self.is_invalid(serializer)
Expand Down Expand Up @@ -123,7 +126,11 @@ def initial(self, request, *args, **kwargs):
if not default_token_generator.check_token(self.user, token):
raise Http404()

return super(OneTimeUseAPIMixin, self).initial(request, *args, **kwargs)
return super(OneTimeUseAPIMixin, self).initial(
request,
*args,
**kwargs
)


class PasswordReset(OneTimeUseAPIMixin, generics.UpdateAPIView):
Expand Down

0 comments on commit cd6745c

Please sign in to comment.