Skip to content

Commit

Permalink
Move a couple of tests to their own file, add the require_POST decora…
Browse files Browse the repository at this point in the history
…tor to the delete_pet view
  • Loading branch information
dirtycoder committed Nov 7, 2016
1 parent 45391ab commit de23d62
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 24 deletions.
43 changes: 43 additions & 0 deletions pets/meupet/tests/test_delete_pet_view.py
@@ -0,0 +1,43 @@
from django.core.urlresolvers import reverse
from django.test import TestCase

from model_mommy import mommy

from meupet.models import Pet
from users.models import OwnerProfile


class DeleteViewTest(TestCase):
def setUp(self):
super(DeleteViewTest, self).setUp()

self.admin = OwnerProfile.objects.create_user(
username='admin',
password='admin',
)
self.pet = mommy.make(Pet, status=Pet.FOR_ADOPTION, owner=self.admin)

def test_owner_can_delete_pet(self):
"""Only the owner should be able to delete its own pet"""
self.client.login(username='admin', password='admin')

response = self.client.post(reverse('meupet:delete_pet', args=[self.pet.slug]), follow=True)

self.assertTemplateUsed(response, 'meupet/index.html')
self.assertNotContains(response, self.pet.name)

def test_user_cant_delete_pet_from_other(self):
"""Assert that an user can't delete pets from other people"""
OwnerProfile.objects.create_user(username='other', password='user')
self.client.login(username='other', password='user')

response = self.client.post(reverse('meupet:delete_pet', args=[self.pet.slug]), follow=True)

self.assertTemplateUsed(response, 'meupet/pet_detail.html')
self.assertContains(response, self.pet.name)

def test_only_accept_post_method(self):
"""View should only accept http POST method"""
response = self.client.get(reverse('meupet:delete_pet', args=[self.pet.slug]))

self.assertEqual(405, response.status_code)
21 changes: 0 additions & 21 deletions pets/meupet/tests/tests.py
Expand Up @@ -121,27 +121,6 @@ def test_load_data_for_editing_pet(self):
self.assertContains(response, pet.description)
self.assertContains(response, 'Salvar Alterações')

def test_owner_can_delete_pet(self):
"""Owner can delete it's own pets"""
pet = self.create_pet()
self.client.login(username='admin', password='admin')

response = self.client.post(reverse('meupet:delete_pet', args=[pet.slug]), follow=True)

self.assertTemplateUsed(response, 'meupet/index.html')
self.assertNotContains(response, pet.name)

def test_user_cant_delete_pet_from_other(self):
"""Assert that an user can't delete pets from other people"""
pet = self.create_pet()
OwnerProfile.objects.create_user(username='other', password='user')
self.client.login(username='other', password='user')

response = self.client.post(reverse('meupet:delete_pet', args=[pet.slug]), follow=True)

self.assertTemplateUsed(response, 'meupet/pet_detail.html')
self.assertContains(response, pet.name)

def test_can_edit_pet(self):
"""Pet's owner can edit it's own pet"""
self.client.login(username='admin', password='admin')
Expand Down
8 changes: 5 additions & 3 deletions pets/meupet/views.py
Expand Up @@ -124,13 +124,15 @@ def form_valid(self, form):
return super(EditPetView, self).form_valid(form)


@require_POST
def delete_pet(request, slug):
pet = get_object_or_404(models.Pet, slug=slug)
if request.method == 'POST' and request.user == pet.owner:

if request.user == pet.owner:
pet.delete()
return HttpResponseRedirect(reverse('meupet:index'))
else:
return HttpResponseRedirect(pet.get_absolute_url())

return HttpResponseRedirect(pet.get_absolute_url())


@require_POST
Expand Down

0 comments on commit de23d62

Please sign in to comment.