diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/file/file.module | 12 | ||||
| -rw-r--r-- | modules/simpletest/tests/form.test | 16 | ||||
| -rw-r--r-- | modules/simpletest/tests/form_test.module | 13 |
3 files changed, 26 insertions, 15 deletions
diff --git a/modules/file/file.module b/modules/file/file.module index f5f642ef2..bc0e292cc 100644 --- a/modules/file/file.module +++ b/modules/file/file.module @@ -572,10 +572,7 @@ function file_managed_file_submit($form, &$form_state) { // and set $element to the managed_file element that contains that button. $parents = $form_state['triggering_element']['#array_parents']; $button_key = array_pop($parents); - $element = $form; - foreach ($parents as $parent) { - $element = $element[$parent]; - } + list($element) = drupal_array_get_nested_value($form, $parents); // No action is needed here for the upload button, because all file uploads on // the form are processed by file_managed_file_value() regardless of which @@ -593,13 +590,10 @@ function file_managed_file_submit($form, &$form_state) { // run, and for form building functions that run during the rebuild, such as // when the managed_file element is part of a field widget. // $form_state['input'] must be updated so that file_managed_file_value() - // has correct information during the rebuild. The Form API provides no - // equivalent of form_set_value() for updating $form_state['input'], so - // inline that implementation with the same logic that form_set_value() - // uses. + // has correct information during the rebuild. $values_element = $element['#extended'] ? $element['fid'] : $element; form_set_value($values_element, NULL, $form_state); - _form_set_value($form_state['input'], $values_element, $values_element['#parents'], NULL); + drupal_array_set_nested_value($form_state['input'], $values_element['#parents'], NULL); } // Set the form to rebuild so that $form is correctly updated in response to diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test index 525a8a291..d628f488b 100644 --- a/modules/simpletest/tests/form.test +++ b/modules/simpletest/tests/form.test @@ -42,7 +42,10 @@ class FormsTestCase extends DrupalWebTestCase { $elements['password']['empty_values'] = $empty_strings; $elements['password_confirm']['element'] = array('#title' => $this->randomName(), '#type' => 'password_confirm'); - $elements['password_confirm']['empty_values'] = $empty_strings; + // Provide empty values for both password fields. + foreach ($empty_strings as $key => $value) { + $elements['password_confirm']['empty_values'][$key] = array('pass1' => $value, 'pass2' => $value); + } $elements['textarea']['element'] = array('#title' => $this->randomName(), '#type' => 'textarea'); $elements['textarea']['empty_values'] = $empty_strings; @@ -77,8 +80,7 @@ class FormsTestCase extends DrupalWebTestCase { $element = $data['element']['#title']; $form[$element] = $data['element']; $form[$element]['#required'] = $required; - $form_state['values'][$element] = $empty; - $form_state['input'] = $form_state['values']; + $form_state['input'][$element] = $empty; $form_state['input']['form_id'] = $form_id; $form_state['method'] = 'post'; drupal_prepare_form($form_id, $form, $form_state); @@ -405,6 +407,10 @@ class FormValidationTestCase extends DrupalWebTestCase { $this->assertNoText(t('!name field is required.', array('!name' => 'Title'))); $this->assertText('Test element is invalid'); + // Ensure not validated values are not available to submit handlers. + $this->drupalPost($path, array('title' => '', 'test' => 'valid'), t('Partial validate')); + $this->assertText('Only validated values appear in the form values.'); + // Now test full form validation and ensure that the #element_validate // handler is still triggered. $this->drupalPost($path, $edit, t('Full validate')); @@ -616,11 +622,11 @@ class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase { ); // Test with a valid value. - list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => 'row1')); + list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => array('row1' => 'row1'))); $this->assertFalse(isset($errors['tableselect']), t('Option checker allows valid values for checkboxes.')); // Test with an invalid value. - list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => 'non_existing_value')); + list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => array('non_existing_value' => 'non_existing_value'))); $this->assertTrue(isset($errors['tableselect']), t('Option checker disallows invalid values for checkboxes.')); } diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module index ab0642fee..17988cdaf 100644 --- a/modules/simpletest/tests/form_test.module +++ b/modules/simpletest/tests/form_test.module @@ -313,7 +313,7 @@ function form_test_limit_validation_errors_form($form, &$form_state) { $form['actions']['partial'] = array( '#type' => 'submit', '#limit_validation_errors' => array(array('test')), - '#submit' => array(), + '#submit' => array('form_test_limit_validation_errors_form_partial_submit'), '#value' => t('Partial validate'), ); $form['actions']['full'] = array( @@ -333,6 +333,17 @@ function form_test_limit_validation_errors_element_validate_test(&$element, &$fo } /** + * Form submit handler for the partial validation submit button. + */ +function form_test_limit_validation_errors_form_partial_submit($form, $form_state) { + // The title has not been validated, thus its value - in case of the test case + // an empty string - may not be set. + if (!isset($form_state['values']['title']) && isset($form_state['values']['test'])) { + drupal_set_message('Only validated values appear in the form values.'); + } +} + +/** * Create a header and options array. Helper function for callbacks. */ function _form_test_tableselect_get_data() { |