diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/contact/contact.admin.inc | 16 | ||||
| -rw-r--r-- | modules/contact/contact.test | 5 | ||||
| -rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 2 |
3 files changed, 10 insertions, 13 deletions
diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc index 16178078c..df9733594 100644 --- a/modules/contact/contact.admin.inc +++ b/modules/contact/contact.admin.inc @@ -79,18 +79,10 @@ function contact_admin_edit($form_state = array(), $op, $contact = NULL) { * Validate the contact category edit page form submission. */ function contact_admin_edit_validate($form, &$form_state) { - if (empty($form_state['values']['category'])) { - form_set_error('category', t('You must enter a category.')); - } - if (empty($form_state['values']['recipients'])) { - form_set_error('recipients', t('You must enter one or more recipients.')); - } - else { - $recipients = explode(',', $form_state['values']['recipients']); - foreach ($recipients as $recipient) { - if (!valid_email_address(trim($recipient))) { - form_set_error('recipients', t('%recipient is an invalid e-mail address.', array('%recipient' => $recipient))); - } + $recipients = explode(',', $form_state['values']['recipients']); + foreach ($recipients as $recipient) { + if (!valid_email_address(trim($recipient))) { + form_set_error('recipients', t('%recipient is an invalid e-mail address.', array('%recipient' => $recipient))); } } } diff --git a/modules/contact/contact.test b/modules/contact/contact.test index 6cfe62994..05f633286 100644 --- a/modules/contact/contact.test +++ b/modules/contact/contact.test @@ -51,6 +51,11 @@ class ContactSitewideTestCase extends DrupalWebTestCase { $this->assertRaw(t('%recipient is an invalid e-mail address.', array('%recipient' => $invalid_recipient)), t('Caught invalid recipient (' . $invalid_recipient . ').')); } + // Test validation of empty category and recipients fields. + $this->addCategory($category = '', '', '', TRUE); + $this->assertText(t('Category field is required.'), t('Caught empty category field')); + $this->assertText(t('Recipients field is required.'), t('Caught empty recipients field.')); + // Create valid categories. $recipients = array('simpletest@test.com', 'simpletest2@test.com', 'simpletest3@test.com'); $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0])), '', TRUE); diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 453824fba..2f3d40155 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -842,7 +842,7 @@ class DrupalWebTestCase { $upload = array(); $submit_matches = $this->handleForm($post, $edit, $upload, $submit, $form); $action = isset($form['action']) ? $this->getAbsoluteUrl($form['action']) : $this->getUrl(); - + // We post only if we managed to handle every field in edit and the // submit button matches. if (!$edit && $submit_matches) { |