diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 22 | ||||
-rw-r--r-- | modules/user/user.test | 20 |
2 files changed, 21 insertions, 21 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 58af4efea..3e0ae5e6f 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -323,13 +323,13 @@ class DrupalWebTestCase extends UnitTestCase { } /** - * Generates a random database prefix, runs the install scripts on the - * prefixed database and enable the specified modules. After installation - * many caches are flushed and the internal browser is setup so that the - * page requests will run on the new prefix. A temporary files directory + * Generates a random database prefix, runs the install scripts on the + * prefixed database and enable the specified modules. After installation + * many caches are flushed and the internal browser is setup so that the + * page requests will run on the new prefix. A temporary files directory * is created with the same name as the database prefix. * - * @param ... + * @param ... * List of modules to enable for the duration of the test. */ function setUp() { @@ -586,7 +586,7 @@ class DrupalWebTestCase extends UnitTestCase { } $out = $this->curlExec(array(CURLOPT_URL => $action, CURLOPT_POST => TRUE, CURLOPT_POSTFIELDS => $post)); // Ensure that any changes to variables in the other thread are picked up. - $this->refreshVariables(); + $this->refreshVariables(); return $out; } } @@ -604,15 +604,15 @@ class DrupalWebTestCase extends UnitTestCase { * exist and attempt to create POST data in the correct manner for the particular * field type. * - * @param array $post + * @param array $post * Reference to array of post values. - * @param array $edit + * @param array $edit * Reference to array of edit values to be checked against the form. - * @param string $submit + * @param string $submit * Form submit button value. - * @param array $form + * @param array $form * Array of form elements. - * @return boolean + * @return boolean * Submit value matches a valid submit input in the form. */ protected function handleForm(&$post, &$edit, &$upload, $submit, $form) { diff --git a/modules/user/user.test b/modules/user/user.test index fe9c9f59b..2272a17d7 100644 --- a/modules/user/user.test +++ b/modules/user/user.test @@ -208,7 +208,7 @@ class UserDeleteTestCase extends DrupalWebTestCase { class UserPictureTestCase extends DrupalWebTestCase { protected $user; protected $_directory_test; - + function getInfo() { return array( 'name' => t('Upload user picture'), @@ -216,18 +216,18 @@ class UserPictureTestCase extends DrupalWebTestCase { 'group' => t('User') ); } - + function setUp() { parent::setUp(); // Enable user pictures. variable_set('user_pictures', 1); - + $this->user = $this->drupalCreateUser(); - + // Test if directories specified in settings exist in filesystem. $file_dir = file_directory_path(); $file_check = file_check_directory($file_dir, FILE_CREATE_DIRECTORY, 'file_directory_path'); - + $picture_dir = variable_get('user_picture_path', 'pictures'); $picture_path = $file_dir .'/'.$picture_dir; @@ -267,7 +267,7 @@ class UserPictureTestCase extends DrupalWebTestCase { variable_set('user_picture_file_size', $test_size); $pic_path = $this->saveUserPicture($image); - + // check if image is displayed in user's profile page $this->assertRaw(file_create_url($pic_path), "Image is displayed in user's profile page"); @@ -291,7 +291,7 @@ class UserPictureTestCase extends DrupalWebTestCase { $image = current($this->drupalGetTestFiles('image')); $info = image_get_info($image->filename); - + // Set new variables. $test_dim = ($info['width'] + 10) . 'x' . ($info['height'] + 10); $test_size = filesize($image->filename); @@ -324,7 +324,7 @@ class UserPictureTestCase extends DrupalWebTestCase { $image = current($this->drupalGetTestFiles('image')); $info = image_get_info($image->filename); - + // Set new variables. $test_size = floor(filesize($image->filename) / 1000) + 1; $test_dim = ($info['width'] - 10) . 'x' . ($info['height'] - 10); @@ -380,7 +380,7 @@ class UserPictureTestCase extends DrupalWebTestCase { function testPictureIsValid() { if ($this->_directory_test) { $this->drupalLogin($this->user); - + $image = current($this->drupalGetTestFiles('image')); $info = image_get_info($image->filename); @@ -400,7 +400,7 @@ class UserPictureTestCase extends DrupalWebTestCase { $this->assertTrue(is_file($pic_path), t('File is located in proper directory')); } } - + function saveUserPicture($image) { $edit = array('files[picture_upload]' => realpath($image->filename)); $this->drupalPost('user/' . $this->user->uid.'/edit', $edit, t('Save')); |