{{ greeting }}
+ + {% if user.is_authenticated and user.is_active or request.is_preview %} + {% if form %} +{{ greeting }}
+ {{ self.thank_you_text|richtext }} +{% endblock %} diff --git a/wagtail/wagtailforms/tests/test_models.py b/wagtail/wagtailforms/tests/test_models.py index 6957fb2c94..065ec66340 100644 --- a/wagtail/wagtailforms/tests/test_models.py +++ b/wagtail/wagtailforms/tests/test_models.py @@ -5,12 +5,12 @@ import json from django.core import mail from django.test import TestCase -from wagtail.tests.testapp.models import FormField, JadeFormPage +from wagtail.tests.testapp.models import CustomFormPageSubmission, FormField, JadeFormPage +from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailcore.models import Page from wagtail.wagtailforms.models import FormSubmission - -from wagtail.wagtailforms.tests.utils import make_form_page +from wagtail.wagtailforms.tests.utils import make_form_page, make_form_page_with_custom_submission class TestFormSubmission(TestCase): @@ -121,6 +121,173 @@ class TestFormSubmission(TestCase): self.assertIn("Your choices: None", mail.outbox[0].body) +class TestFormWithCustomSubmission(TestCase, WagtailTestUtils): + def setUp(self): + # Create a form page + self.form_page = make_form_page_with_custom_submission() + + self.user = self.login() + + def test_get_form(self): + response = self.client.get('/contact-us/') + + # Check response + self.assertContains(response, """""") + self.assertTemplateUsed(response, 'tests/form_page_with_custom_submission.html') + self.assertTemplateNotUsed(response, 'tests/form_page_with_custom_submission_landing.html') + self.assertNotContains(response, 'Boring intro text
', html=True) + + # check that variables defined in get_context are passed through to the template (#1429) + self.assertContains(response, "hello world
") + + def test_get_form_with_anonymous_user(self): + self.client.logout() + + response = self.client.get('/contact-us/') + + # Check response + self.assertNotContains(response, """""") + self.assertTemplateUsed(response, 'tests/form_page_with_custom_submission.html') + self.assertTemplateNotUsed(response, 'tests/form_page_with_custom_submission_landing.html') + self.assertContains(response, 'Boring intro text
', html=True) + + # check that variables defined in get_context are passed through to the template (#1429) + self.assertContains(response, "hello world
") + + def test_post_invalid_form(self): + response = self.client.post('/contact-us/', { + 'your-email': 'bob', + 'your-message': 'hello world', + 'your-choices': '' + }) + + # Check response + self.assertContains(response, "Enter a valid email address.") + self.assertTemplateUsed(response, 'tests/form_page_with_custom_submission.html') + self.assertTemplateNotUsed(response, 'tests/form_page_with_custom_submission_landing.html') + + def test_post_valid_form(self): + response = self.client.post('/contact-us/', { + 'your-email': 'bob@example.com', + 'your-message': 'hello world', + 'your-choices': {'foo': '', 'bar': '', 'baz': ''} + }) + + # Check response + self.assertContains(response, "Thank you for your patience!") + self.assertTemplateNotUsed(response, 'tests/form_page_with_custom_submission.html') + self.assertTemplateUsed(response, 'tests/form_page_with_custom_submission_landing.html') + + # check that variables defined in get_context are passed through to the template (#1429) + self.assertContains(response, "hello world
") + + # Check that an email was sent + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].subject, "The subject") + self.assertIn("Your message: hello world", mail.outbox[0].body) + self.assertEqual(mail.outbox[0].to, ['to@email.com']) + self.assertEqual(mail.outbox[0].from_email, 'from@email.com') + + # Check that form submission was saved correctly + form_page = Page.objects.get(url_path='/home/contact-us/') + self.assertTrue(CustomFormPageSubmission.objects.filter(page=form_page, form_data__contains='hello world').exists()) + + def test_post_form_twice(self): + # First submission + response = self.client.post('/contact-us/', { + 'your-email': 'bob@example.com', + 'your-message': 'hello world', + 'your-choices': {'foo': '', 'bar': '', 'baz': ''} + }) + + # Check response + self.assertTemplateNotUsed(response, 'tests/form_page_with_custom_submission.html') + self.assertTemplateUsed(response, 'tests/form_page_with_custom_submission_landing.html') + self.assertContains(response, 'Thank you for your patience!
', html=True) + self.assertNotContains(response, 'Thank you for your patience!
', html=True) + self.assertContains(response, 'Boring intro text
', html=True) + + # Check that first submission exists and second submission wasn't saved + submissions_qs = CustomFormPageSubmission.objects.filter(user=self.user, page=self.form_page) + self.assertEqual(submissions_qs.count(), 1) + self.assertTrue(submissions_qs.filter(form_data__contains='hello world').exists()) + self.assertFalse(submissions_qs.filter(form_data__contains='hello cruel world').exists()) + + def test_post_unicode_characters(self): + self.client.post('/contact-us/', { + 'your-email': 'bob@example.com', + 'your-message': 'こんにちは、世界', + 'your-choices': {'foo': '', 'bar': '', 'baz': ''} + }) + + # Check the email + self.assertEqual(len(mail.outbox), 1) + self.assertIn("Your message: こんにちは、世界", mail.outbox[0].body) + + # Check the form submission + submission = CustomFormPageSubmission.objects.get() + submission_data = json.loads(submission.form_data) + self.assertEqual(submission_data['your-message'], 'こんにちは、世界') + + def test_post_multiple_values(self): + response = self.client.post('/contact-us/', { + 'your-email': 'bob@example.com', + 'your-message': 'hello world', + 'your-choices': {'foo': 'on', 'bar': 'on', 'baz': 'on'} + }) + + # Check response + self.assertContains(response, "Thank you for your patience!") + self.assertTemplateNotUsed(response, 'tests/form_page_with_custom_submission.html') + self.assertTemplateUsed(response, 'tests/form_page_with_custom_submission_landing.html') + + # Check that the three checkbox values were saved correctly + form_page = Page.objects.get(url_path='/home/contact-us/') + submission = CustomFormPageSubmission.objects.filter( + page=form_page, form_data__contains='hello world' + ) + self.assertIn("foo", submission[0].form_data) + self.assertIn("bar", submission[0].form_data) + self.assertIn("baz", submission[0].form_data) + + def test_post_blank_checkbox(self): + response = self.client.post('/contact-us/', { + 'your-email': 'bob@example.com', + 'your-message': 'hello world', + 'your-choices': {}, + }) + + # Check response + self.assertContains(response, "Thank you for your patience!") + self.assertTemplateNotUsed(response, 'tests/form_page_with_custom_submission.html') + self.assertTemplateUsed(response, 'tests/form_page_with_custom_submission_landing.html') + + # Check that the checkbox was serialised in the email correctly + self.assertEqual(len(mail.outbox), 1) + self.assertIn("Your choices: None", mail.outbox[0].body) + + class TestFormSubmissionWithMultipleRecipients(TestCase): def setUp(self): # Create a form page @@ -154,8 +321,44 @@ class TestFormSubmissionWithMultipleRecipients(TestCase): self.assertTrue(FormSubmission.objects.filter(page=form_page, form_data__contains='hello world').exists()) -# TODO: TestFormWithCustomSubmission -# TODO: TestFormSubmissionWithMultipleRecipientsAndWithCustomSubmission +class TestFormSubmissionWithMultipleRecipientsAndWithCustomSubmission(TestCase, WagtailTestUtils): + def setUp(self): + # Create a form page + self.form_page = make_form_page_with_custom_submission( + to_address='to@email.com, another@email.com' + ) + + self.user = self.login() + + def test_post_valid_form(self): + response = self.client.post('/contact-us/', { + 'your-email': 'bob@example.com', + 'your-message': 'hello world', + 'your-choices': {'foo': '', 'bar': '', 'baz': ''} + }) + + # Check response + self.assertContains(response, "Thank you for your patience!") + self.assertTemplateNotUsed(response, 'tests/form_page_with_custom_submission.html') + self.assertTemplateUsed(response, 'tests/form_page_with_custom_submission_landing.html') + + # check that variables defined in get_context are passed through to the template (#1429) + self.assertContains(response, "hello world
") + + # Check that one email was sent, but to two recipients + self.assertEqual(len(mail.outbox), 1) + + self.assertEqual(mail.outbox[0].subject, "The subject") + self.assertIn("Your message: hello world", mail.outbox[0].body) + self.assertEqual(mail.outbox[0].from_email, 'from@email.com') + self.assertEqual(set(mail.outbox[0].to), {'to@email.com', 'another@email.com'}) + + # Check that form submission was saved correctly + form_page = Page.objects.get(url_path='/home/contact-us/') + self.assertTrue( + CustomFormPageSubmission.objects.filter(page=form_page, form_data__contains='hello world').exists() + ) + class TestIssue798(TestCase): fixtures = ['test.json'] diff --git a/wagtail/wagtailforms/tests/test_views.py b/wagtail/wagtailforms/tests/test_views.py index e776f5c87d..a1dd0036bc 100644 --- a/wagtail/wagtailforms/tests/test_views.py +++ b/wagtail/wagtailforms/tests/test_views.py @@ -3,17 +3,19 @@ from __future__ import absolute_import, unicode_literals import json +from django.contrib.auth import get_user_model from django.core.urlresolvers import reverse from django.test import TestCase -from wagtail.tests.testapp.models import FormField, FormPage +from wagtail.tests.testapp.models import ( + CustomFormPageSubmission, FormField, FormFieldWithCustomSubmission, FormPage) from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin.edit_handlers import get_form_for_model from wagtail.wagtailadmin.forms import WagtailAdminPageForm from wagtail.wagtailcore.models import Page from wagtail.wagtailforms.edit_handlers import FormSubmissionsPanel from wagtail.wagtailforms.models import FormSubmission -from wagtail.wagtailforms.tests.utils import make_form_page +from wagtail.wagtailforms.tests.utils import make_form_page, make_form_page_with_custom_submission class TestFormResponsesPanel(TestCase): @@ -153,8 +155,7 @@ class TestFormsIndex(TestCase, WagtailTestUtils): self.assertNotIn(self.form_page, response.context['form_pages']) -# TODO: Rename to TestFormsSubmissionsList -class TestFormsSubmissions(TestCase, WagtailTestUtils): +class TestFormsSubmissionsList(TestCase, WagtailTestUtils): def setUp(self): # Create a form page self.form_page = make_form_page() @@ -295,6 +296,36 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils): # Check that we got the last page self.assertEqual(response.context['submissions'].number, response.context['submissions'].paginator.num_pages) + +class TestFormsSubmissionsExport(TestCase, WagtailTestUtils): + def setUp(self): + # Create a form page + self.form_page = make_form_page() + + # Add a couple of form submissions + old_form_submission = FormSubmission.objects.create( + page=self.form_page, + form_data=json.dumps({ + 'your-email': "old@example.com", + 'your-message': "this is a really old message", + }), + ) + old_form_submission.submit_time = '2013-01-01T12:00:00.000Z' + old_form_submission.save() + + new_form_submission = FormSubmission.objects.create( + page=self.form_page, + form_data=json.dumps({ + 'your-email': "new@example.com", + 'your-message': "this is a fairly new message", + }), + ) + new_form_submission.submit_time = '2014-01-01T12:00:00.000Z' + new_form_submission.save() + + # Login + self.login() + def test_list_submissions_csv_export(self): response = self.client.get( reverse('wagtailforms:list_submissions', args=(self.form_page.id,)), @@ -430,7 +461,303 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils): self.assertIn('vim', data_lines[1]) -# TODO: add TestCustomFormsSubmissionsList +class TestCustomFormsSubmissionsExport(TestCase, WagtailTestUtils): + def create_test_user_without_admin(self, username): + return get_user_model().objects.create_user(username=username, password='123') + + def setUp(self): + # Create a form page + self.form_page = make_form_page_with_custom_submission() + + # Add a couple of form submissions + old_form_submission = CustomFormPageSubmission.objects.create( + user=self.create_test_user_without_admin('user-john'), + page=self.form_page, + form_data=json.dumps({ + 'your-email': "old@example.com", + 'your-message': "this is a really old message", + }), + ) + old_form_submission.submit_time = '2013-01-01T12:00:00.000Z' + old_form_submission.save() + + new_form_submission = CustomFormPageSubmission.objects.create( + user=self.create_test_user_without_admin('user-m1kola'), + page=self.form_page, + form_data=json.dumps({ + 'your-email': "new@example.com", + 'your-message': "this is a fairly new message", + }), + ) + new_form_submission.submit_time = '2014-01-01T12:00:00.000Z' + new_form_submission.save() + + # Login + self.login() + + def test_list_submissions_csv_export(self): + response = self.client.get( + reverse('wagtailforms:list_submissions', args=(self.form_page.id,)), + {'action': 'CSV'} + ) + + # Check response + self.assertEqual(response.status_code, 200) + data_lines = response.content.decode().split("\n") + + self.assertEqual(data_lines[0], 'Username,Submission date,Your email,Your message,Your choices\r') + self.assertEqual(data_lines[1], + 'user-john,2013-01-01 12:00:00+00:00,old@example.com,this is a really old message,None\r') + self.assertEqual(data_lines[2], + 'user-m1kola,2014-01-01 12:00:00+00:00,new@example.com,this is a fairly new message,None\r') + + def test_list_submissions_csv_export_with_date_from_filtering(self): + response = self.client.get( + reverse('wagtailforms:list_submissions', args=(self.form_page.id,)), + {'action': 'CSV', 'date_from': '01/01/2014'} + ) + + # Check response + self.assertEqual(response.status_code, 200) + data_lines = response.content.decode().split("\n") + + self.assertEqual(data_lines[0], 'Username,Submission date,Your email,Your message,Your choices\r') + self.assertEqual(data_lines[1], + 'user-m1kola,2014-01-01 12:00:00+00:00,new@example.com,this is a fairly new message,None\r') + + def test_list_submissions_csv_export_with_date_to_filtering(self): + response = self.client.get( + reverse('wagtailforms:list_submissions', args=(self.form_page.id,)), + {'action': 'CSV', 'date_to': '12/31/2013'} + ) + + # Check response + self.assertEqual(response.status_code, 200) + data_lines = response.content.decode().split("\n") + + self.assertEqual(data_lines[0], 'Username,Submission date,Your email,Your message,Your choices\r') + self.assertEqual(data_lines[1], + 'user-john,2013-01-01 12:00:00+00:00,old@example.com,this is a really old message,None\r') + + def test_list_submissions_csv_export_with_range_filtering(self): + response = self.client.get( + reverse('wagtailforms:list_submissions', args=(self.form_page.id,)), + {'action': 'CSV', 'date_from': '12/31/2013', 'date_to': '01/02/2014'} + ) + + # Check response + self.assertEqual(response.status_code, 200) + data_lines = response.content.decode().split("\n") + + self.assertEqual(data_lines[0], 'Username,Submission date,Your email,Your message,Your choices\r') + self.assertEqual(data_lines[1], + 'user-m1kola,2014-01-01 12:00:00+00:00,new@example.com,this is a fairly new message,None\r') + + def test_list_submissions_csv_export_with_unicode_in_submission(self): + unicode_form_submission = CustomFormPageSubmission.objects.create( + user=self.create_test_user_without_admin('user-bob'), + page=self.form_page, + form_data=json.dumps({ + 'your-email': "unicode@example.com", + 'your-message': 'こんにちは、世界', + }), + ) + unicode_form_submission.submit_time = '2014-01-02T12:00:00.000Z' + unicode_form_submission.save() + + response = self.client.get( + reverse('wagtailforms:list_submissions', args=(self.form_page.id,)), + {'date_from': '01/02/2014', 'action': 'CSV'} + ) + + # Check response + self.assertEqual(response.status_code, 200) + data_line = response.content.decode('utf-8').split("\n")[1] + self.assertIn('こんにちは、世界', data_line) + + def test_list_submissions_csv_export_with_unicode_in_field(self): + FormFieldWithCustomSubmission.objects.create( + page=self.form_page, + sort_order=2, + label="Выберите самую любимую IDE для разработке на Python", + help_text="Вы можете выбрать только один вариант", + field_type='radio', + required=True, + choices='PyCharm,vim,nano', + ) + unicode_form_submission = CustomFormPageSubmission.objects.create( + user=self.create_test_user_without_admin('user-bob'), + page=self.form_page, + form_data=json.dumps({ + 'your-email': "unicode@example.com", + 'your-message': "We don\'t need unicode here", + 'vyberite-samuiu-liubimuiu-ide-dlia-razrabotke-na-python': "vim", + }), + ) + unicode_form_submission.submit_time = '2014-01-02T12:00:00.000Z' + unicode_form_submission.save() + + response = self.client.get( + reverse('wagtailforms:list_submissions', args=(self.form_page.id,)), + {'date_from': '01/02/2014', 'action': 'CSV'} + ) + + # Check response + self.assertEqual(response.status_code, 200) + + data_lines = response.content.decode('utf-8').split("\n") + self.assertIn('Выберите самую любимую IDE для разработке на Python', data_lines[0]) + self.assertIn('vim', data_lines[1]) + + +class TestCustomFormsSubmissionsList(TestCase, WagtailTestUtils): + def create_test_user_without_admin(self, username): + return get_user_model().objects.create_user(username=username, password='123') + + def setUp(self): + # Create a form page + self.form_page = make_form_page_with_custom_submission() + + # Add a couple of form submissions + old_form_submission = CustomFormPageSubmission.objects.create( + user=self.create_test_user_without_admin('user-john'), + page=self.form_page, + form_data=json.dumps({ + 'your-email': "old@example.com", + 'your-message': "this is a really old message", + }), + ) + old_form_submission.submit_time = '2013-01-01T12:00:00.000Z' + old_form_submission.save() + + new_form_submission = CustomFormPageSubmission.objects.create( + user=self.create_test_user_without_admin('user-m1kola'), + page=self.form_page, + form_data=json.dumps({ + 'your-email': "new@example.com", + 'your-message': "this is a fairly new message", + }), + ) + new_form_submission.submit_time = '2014-01-01T12:00:00.000Z' + new_form_submission.save() + + # Login + self.login() + + def make_list_submissions(self): + """ + This makes 100 submissions to test pagination on the forms submissions page + """ + for i in range(100): + submission = CustomFormPageSubmission( + user=self.create_test_user_without_admin('generated-username-%s' % i), + page=self.form_page, + form_data=json.dumps({ + 'your-email': "generated-your-email-%s" % i, + 'your-message': "generated-your-message-%s" % i, + }) + ) + submission.save() + + def test_list_submissions(self): + response = self.client.get(reverse('wagtailforms:list_submissions', args=(self.form_page.id,))) + + # Check response + self.assertEqual(response.status_code, 200) + self.assertTemplateUsed(response, 'wagtailforms/index_submissions.html') + self.assertEqual(len(response.context['data_rows']), 2) + + # CustomFormPageSubmission have custom field. This field should appear in the listing + self.assertContains(response, 'Boring intro text
") + kwargs.setdefault('thank_you_text', "Thank you for your patience!
") + kwargs.setdefault('slug', "contact-us") + kwargs.setdefault('to_address', "to@email.com") + kwargs.setdefault('from_address', "from@email.com") + kwargs.setdefault('subject', "The subject") + + home_page = Page.objects.get(url_path='/home/') + form_page = home_page.add_child(instance=FormPageWithCustomSubmission(**kwargs)) + + FormFieldWithCustomSubmission.objects.create( + page=form_page, + sort_order=1, + label="Your email", + field_type='email', + required=True, + ) + FormFieldWithCustomSubmission.objects.create( + page=form_page, + sort_order=2, + label="Your message", + field_type='multiline', + required=True, + ) + FormFieldWithCustomSubmission.objects.create( + page=form_page, + sort_order=3, + label="Your choices", + field_type='checkboxes', + required=False, + choices='foo,bar,baz', + ) + + return form_page