Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #265809 by dropcube: fixed some typos.

merge-requests/26/head
Dries Buytaert 2008-06-03 13:45:07 +00:00
parent 4cdbf9c078
commit cccf98aaa0
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/simpletest/drupal_web_test_case.php
View File

@ -559,10 +559,8 @@ class DrupalWebTestCase extends UnitTestCase {
} }
/** /**
* Do a post request on a drupal page. * Execute a POST request on a Drupal page.
* It will be done as usual post request with SimpleBrowser * It will be done as usual POST request with SimpleBrowser.
* By $reporting you specify if this request does assertions or not
* Warning: empty ("") returns will cause fails with $reporting
* *
* @param string $path * @param string $path
* Location of the post form. Either a Drupal path or an absolute path or * Location of the post form. Either a Drupal path or an absolute path or
@ -572,7 +570,7 @@ class DrupalWebTestCase extends UnitTestCase {
* (where possible) to the values indicated. A checkbox can be set to * (where possible) to the values indicated. A checkbox can be set to
* TRUE to be checked and FALSE to be unchecked. * TRUE to be checked and FALSE to be unchecked.
* @param string $submit * @param string $submit
* Untranslated value, id or name of the submit button. * Value of the submit button.
* @param $tamper * @param $tamper
* If this is set to TRUE then you can post anything, otherwise hidden and * If this is set to TRUE then you can post anything, otherwise hidden and
* nonexistent fields are not posted. * nonexistent fields are not posted.
@ -600,7 +598,7 @@ class DrupalWebTestCase extends UnitTestCase {
$action = isset($form['action']) ? $this->getAbsoluteUrl($form['action']) : $this->getUrl(); $action = isset($form['action']) ? $this->getAbsoluteUrl($form['action']) : $this->getUrl();
} }
// We post only if we managed to handle every field in edit and the // We post only if we managed to handle every field in edit and the
// submit button matches; // submit button matches.
if (!$edit && $submit_matches) { if (!$edit && $submit_matches) {
// This part is not pretty. There is very little I can do. // This part is not pretty. There is very little I can do.
if ($upload) { if ($upload) {
@ -618,14 +616,15 @@ class DrupalWebTestCase extends UnitTestCase {
$post_array = $post; $post_array = $post;
$post = array(); $post = array();
foreach ($post_array as $key => $value) { foreach ($post_array as $key => $value) {
// Whethet this needs to be urlencode or rawurlencode, is not // Whether this needs to be urlencode or rawurlencode, is not
// quite clear, but this seems to be the better choice. // quite clear, but this seems to be the better choice.
$post[] = urlencode($key) . '=' . urlencode($value); $post[] = urlencode($key) . '=' . urlencode($value);
} }
$post = implode('&', $post); $post = implode('&', $post);
} }
$out = $this->curlExec(array(CURLOPT_URL => $action, CURLOPT_POSTFIELDS => $post, CURLOPT_POST => TRUE)); $out = $this->curlExec(array(CURLOPT_URL => $action, CURLOPT_POSTFIELDS => $post, CURLOPT_POST => TRUE));
$this->refreshVariables(); // Ensure that any changes to variables in the other thread are picked up. // Ensure that any changes to variables in the other thread are picked up.
$this->refreshVariables();
return $out; return $out;
} }
} }
@ -640,14 +639,19 @@ class DrupalWebTestCase extends UnitTestCase {
/** /**
* Handle form input related to drupalPost(). Ensure that the specified fields * Handle form input related to drupalPost(). Ensure that the specified fields
* exist and attempt to create POST data in the correct manor for the particular * exist and attempt to create POST data in the correct manner for the particular
* field type. * field type.
* *
* @param array $post Reference to array of post values. * @param array $post
* @param array $edit Reference to array of edit values to be checked against the form. * Reference to array of post values.
* @param string $submit Form submit button value. * @param array $edit
* @param array $form Array of form elements. * Reference to array of edit values to be checked against the form.
* @return boolean Submit value matches a valid submit input in the form. * @param string $submit
* Form submit button value.
* @param array $form
* Array of form elements.
* @return boolean
* Submit value matches a valid submit input in the form.
*/ */
protected function handleForm(&$post, &$edit, &$upload, $submit, $form) { protected function handleForm(&$post, &$edit, &$upload, $submit, $form) {
// Retrieve the form elements. // Retrieve the form elements.