From 11aeee8ad59577e0a80d05ac97293cd4ad946ef2 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Wed, 8 Aug 2012 14:32:17 +1000 Subject: [PATCH] Improve public action tests --- helpdesk/tests/public_actions.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/helpdesk/tests/public_actions.py b/helpdesk/tests/public_actions.py index 4ecd517c..95ccfb70 100644 --- a/helpdesk/tests/public_actions.py +++ b/helpdesk/tests/public_actions.py @@ -21,29 +21,33 @@ class PublicActionsTestCase(TestCase): self.client = Client() def test_public_view_ticket(self): - response = self.client.get('%s?id=%s&email=%s' % (reverse('helpdesk_public_view'), self.ticket.id, 'test.submitter@example.com')) + response = self.client.get('%s?ticket=%s&email=%s' % (reverse('helpdesk_public_view'), self.ticket.ticket_for_url, 'test.submitter@example.com')) self.assertEqual(response.status_code, 200) + self.assertTemplateNotUsed(response, 'helpdesk/public_view_form.html') def test_public_close(self): old_status = self.ticket.status old_resolution = self.ticket.resolution resolution_text = 'Resolved by test script' - - self.ticket.status = Ticket.RESOLVED_STATUS - self.ticket.resolution = resolution_text - self.ticket.save() - current_followups = self.ticket.followup_set.all().count() + ticket = Ticket.objects.get(id=self.ticket.id) + + ticket.status = Ticket.RESOLVED_STATUS + ticket.resolution = resolution_text + ticket.save() + + current_followups = ticket.followup_set.all().count() + + response = self.client.get('%s?ticket=%s&email=%s&close' % (reverse('helpdesk_public_view'), ticket.ticket_for_url, 'test.submitter@example.com')) - response = self.client.get('%s?id=%s&email=%s&close=yes' % (reverse('helpdesk_public_view'), self.ticket.id, 'test.submitter@example.com')) ticket = Ticket.objects.get(id=self.ticket.id) - self.assertEqual(response.status_code, 200) + self.assertEqual(response.status_code, 302) + self.assertTemplateNotUsed(response, 'helpdesk/public_view_form.html') self.assertEqual(ticket.status, Ticket.CLOSED_STATUS) self.assertEqual(ticket.resolution, resolution_text) - self.assertEqual(current_followups+1, self.ticket.followup_set.all().count()) + self.assertEqual(current_followups+1, ticket.followup_set.all().count()) - - self.ticket.resolution = old_resolution - self.ticket.status = old_status - self.ticket.save() + ticket.resolution = old_resolution + ticket.status = old_status + ticket.save()