external-repos/ivatar
1
0
Fork 0
mirror of https://git.linux-kernel.at/oliver/ivatar.git synced 2025-11-17 05:28:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests and eliminate bug, since we use filter now, we cannot depend on an exception raised

Browse Source
This commit is contained in:
Oliver Falk
2018-07-11 09:04:17 +02:00
parent 0ac96e2ed0
commit 7ffd21dee7
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ivatar/ivataraccount/test_views.py
View File

@@ -333,7 +333,7 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods
'unable to import photo from Gravatar?') 'unable to import photo from Gravatar?')
self.assertEqual( self.assertEqual(
str(list(response.context[0]['messages'])[0]), str(list(response.context[0]['messages'])[0]),
'Image successfully imported', 'Gravatar image successfully imported',
'Importing gravatar photo did not work?') 'Importing gravatar photo did not work?')
self.assertIsInstance( self.assertIsInstance(
self.user.photo_set.first(), self.user.photo_set.first(),
@@ -1162,8 +1162,6 @@ class Tester(TestCase): # pylint: disable=too-many-public-methods
) )
url = '%s?%s' % (urlobj.path, urlobj.query) url = '%s?%s' % (urlobj.path, urlobj.query)
response = self.client.get(url, follow=False) response = self.client.get(url, follow=False)
print(response)
print(response.content)
self.assertRedirects( self.assertRedirects(
response=response, response=response,
expected_url=default, expected_url=default,

20
ivatar/ivataraccount/views.py
View File

@@ -276,7 +276,14 @@ class ImportPhotoView(SuccessMessageMixin, TemplateView):
context['photos'] = [] context['photos'] = []
addr = None addr = None
if 'email_id' in kwargs: if 'email_id' in kwargs:
addr = ConfirmedEmail.objects.get(pk=kwargs['email_id']).email try:
addr = ConfirmedEmail.objects.get(pk=kwargs['email_id']).email
except:
messages.error(
self.request,
_('Address does not exist'))
return context
if 'email_addr' in kwargs: if 'email_addr' in kwargs:
addr = kwargs['email_addr'] addr = kwargs['email_addr']
@@ -324,12 +331,11 @@ class ImportPhotoView(SuccessMessageMixin, TemplateView):
addr = request.POST['email_addr'] addr = request.POST['email_addr']
if email_id: if email_id:
try: email = ConfirmedEmail.objects.filter(
email = ConfirmedEmail.objects.filter( id=email_id, user=request.user)
id=email_id, user=request.user) if email.count() > 0:
if email.count() > 0: addr = email.first().email
addr = email.first().email else:
except ConfirmedEmail.DoesNotExist: # pylint: disable=no-member
messages.error( messages.error(
request, request,
_('Address does not exist')) _('Address does not exist'))