From 160b42812c2ec0a32fcdcd02f32d3f86e549fac7 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 12 Mar 2010 14:38:37 +0000
Subject: - Patch #335035 by boombatower, Damien Tournoud, ksenzee, Berdir,
 Dave Reid, effulgentsia: Simpletest drupalPost() incorrectly submits input
 for disabled elements, causing unreliable testing of forms that contain them.

---
 modules/simpletest/drupal_web_test_case.php | 2 +-
 modules/simpletest/tests/form.test          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/simpletest')

diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 24a2acb81..f2622444d 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1747,7 +1747,7 @@ class DrupalWebTestCase extends DrupalTestCase {
    */
   protected function handleForm(&$post, &$edit, &$upload, $submit, $form) {
     // Retrieve the form elements.
-    $elements = $form->xpath('.//input|.//textarea|.//select');
+    $elements = $form->xpath('.//input[not(@disabled)]|.//textarea[not(@disabled)]|.//select[not(@disabled)]');
     $submit_matches = FALSE;
     foreach ($elements as $element) {
       // SimpleXML objects need string casting all the time.
diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test
index 82a9b9e08..87dd698d8 100644
--- a/modules/simpletest/tests/form.test
+++ b/modules/simpletest/tests/form.test
@@ -172,7 +172,7 @@ class FormsTestCase extends DrupalWebTestCase {
           // Checkboxes values are not filtered out.
           $returned_values[$key] = array_filter($returned_values[$key]);
         }
-        $this->assertEqual($expected_value, $returned_values[$key], t('Default value for %type: expected %expected, returned %returned.', array('%type' => $key, '%expected' => var_export($expected_value, TRUE), '%returned' => var_export($returned_values[$key], TRUE))));
+        $this->assertIdentical($expected_value, $returned_values[$key], t('Default value for %type: expected %expected, returned %returned.', array('%type' => $key, '%expected' => var_export($expected_value, TRUE), '%returned' => var_export($returned_values[$key], TRUE))));
       }
     }
   }
-- 
cgit v1.2.3