From 2b4b19a6414d2a20654baf540fb89df907622de0 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 4 Jun 2014 16:38:44 +0100 Subject: [PATCH] Use reversed URLs in wagtailforms tests --- wagtail/wagtailforms/tests.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py index 5145eae3f..24bace8c5 100644 --- a/wagtail/wagtailforms/tests.py +++ b/wagtail/wagtailforms/tests.py @@ -3,6 +3,7 @@ import json from django.test import TestCase from django.core import mail from django import forms +from django.core.urlresolvers import reverse from wagtail.wagtailcore.models import Page from wagtail.wagtailforms.models import FormSubmission @@ -122,7 +123,7 @@ class TestFormsIndex(TestCase): )) def test_forms_index(self): - response = self.client.get('/admin/forms/') + response = self.client.get(reverse('wagtailforms_index')) # Check response self.assertEqual(response.status_code, 200) @@ -133,7 +134,7 @@ class TestFormsIndex(TestCase): self.make_form_pages() # Get page two - response = self.client.get('/admin/forms/', {'p': 2}) + response = self.client.get(reverse('wagtailforms_index'), {'p': 2}) # Check response self.assertEqual(response.status_code, 200) @@ -147,7 +148,7 @@ class TestFormsIndex(TestCase): self.make_form_pages() # Get page two - response = self.client.get('/admin/forms/', {'p': 'Hello world!'}) + response = self.client.get(reverse('wagtailforms_index'), {'p': 'Hello world!'}) # Check response self.assertEqual(response.status_code, 200) @@ -161,7 +162,7 @@ class TestFormsIndex(TestCase): self.make_form_pages() # Get page two - response = self.client.get('/admin/forms/', {'p': 99999}) + response = self.client.get(reverse('wagtailforms_index'), {'p': 99999}) # Check response self.assertEqual(response.status_code, 200) @@ -174,13 +175,13 @@ class TestFormsIndex(TestCase): # Login with as a user without permission to see forms self.client.login(username='eventeditor', password='password') - response = self.client.get('/admin/forms/') + response = self.client.get(reverse('wagtailforms_index')) # Check that the user cannot see the form page self.assertFalse(self.form_page in response.context['form_pages']) def test_can_see_forms_with_permission(self): - response = self.client.get('/admin/forms/') + response = self.client.get(reverse('wagtailforms_index')) # Check that the user can see the form page self.assertTrue(self.form_page in response.context['form_pages']) @@ -207,7 +208,7 @@ class TestFormsSubmissions(TestCase): submission.save() def test_list_submissions(self): - response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id) + response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, ))) # Check response self.assertEqual(response.status_code, 200) @@ -215,7 +216,7 @@ class TestFormsSubmissions(TestCase): self.assertEqual(len(response.context['data_rows']), 2) def test_list_submissions_filtering(self): - response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014' % self.form_page.id) + response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'date_from': '01/01/2014'}) # Check response self.assertEqual(response.status_code, 200) @@ -225,7 +226,7 @@ class TestFormsSubmissions(TestCase): def test_list_submissions_pagination(self): self.make_list_submissions() - response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 2}) + response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 2}) # Check response self.assertEqual(response.status_code, 200) @@ -237,7 +238,7 @@ class TestFormsSubmissions(TestCase): def test_list_submissions_pagination_invalid(self): self.make_list_submissions() - response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 'Hello World!'}) + response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 'Hello World!'}) # Check response self.assertEqual(response.status_code, 200) @@ -249,7 +250,7 @@ class TestFormsSubmissions(TestCase): def test_list_submissions_pagination_out_of_range(self): self.make_list_submissions() - response = self.client.get('/admin/forms/submissions/%d/' % self.form_page.id, {'p': 99999}) + response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 99999}) # Check response self.assertEqual(response.status_code, 200) @@ -259,7 +260,7 @@ class TestFormsSubmissions(TestCase): self.assertEqual(response.context['submissions'].number, response.context['submissions'].paginator.num_pages) def test_list_submissions_csv_export(self): - response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014&action=CSV' % self.form_page.id) + response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'date_from': '01/01/2014', 'action': 'CSV'}) # Check response self.assertEqual(response.status_code, 200)