- Patch #322344 by merlinofchaos, Frando, catch, sun: form improvements from Views.

1 files changed, 7 insertions, 5 deletions

diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test
index 8d376bfb7..b51c116d0 100644
--- a/modules/simpletest/tests/form.test
+++ b/modules/simpletest/tests/form.test
@@ -60,8 +60,9 @@ class FormsTestCase extends DrupalWebTestCase {
         $element = $data['element']['#title'];
         $form[$element] = $data['element'];
         $form_state['values'][$element] = $empty;
-        $form['#post'] = $form_state['values'];
-        $form['#post']['form_id'] = $form_id;
+        $form_state['input'] = $form_state['values'];
+        $form_state['input']['form_id'] = $form_id;
+        $form_state['method'] = 'post';
         drupal_prepare_form($form_id, $form, $form_state);
         drupal_process_form($form_id, $form, $form_state);
         $errors = form_get_errors();
@@ -288,13 +289,14 @@ class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase {
   private function formSubmitHelper($form_element, $edit) {
     $form_id = $this->randomName();
 
-    $form = $form_state = array();
+    $form_state = form_state_defaults();
+    $form = array();
 
     $form = array_merge($form, $form_element);
     $form['op'] = array('#type' => 'submit', '#value' => t('Submit'));
 
-    $form['#post'] = $edit;
-    $form['#post']['form_id'] = $form_id;
+    $form_state['input'] = $edit;
+    $form_state['input']['form_id'] = $form_id;
 
     drupal_prepare_form($form_id, $form, $form_state);