Commit 76aedbef authored by Dries's avatar Dries
Browse files

- Patch #267813 by alpritt: fixed some user module tests.

parent caa2e7e1
......@@ -252,6 +252,6 @@ function getParentWeight($form = NULL, $keys = NULL ) {
}
function unit_tests($args, $reporter) {
return $reporter->form['Drupal Unit Tests'];
return $reporter->form['Drupal unit tests'];
}
?>
\ No newline at end of file
?>
......@@ -36,7 +36,7 @@ class DrupalTests extends DrupalTestSuite {
*/
function DrupalTests($class_list = NULL) {
static $classes;
$this->DrupalTestSuite('Drupal Unit Tests');
$this->DrupalTestSuite('Drupal unit tests');
// Tricky part to avoid double inclusion.
if (!$classes) {
......
......@@ -210,9 +210,9 @@ function paintFooter($test_name) {
print "OK\n";
}
else {
print "FAILURES!!!\n";
print "FAILURES\n";
}
print "Test cases run: ". $this->getTestCaseProgress() ."/". $this->getTestCaseCount() .", Passes: ". $this->getPassCount() .", Failures: ". $this->getFailCount() .", Exceptions: ". $this->getExceptionCount() ."\n";
print "Test cases run: ". $this->getTestCaseProgress() ."/". $this->getTestCaseCount() .", passes: ". $this->getPassCount() .", failures: ". $this->getFailCount() .", exceptions: ". $this->getExceptionCount() ."\n";
}
/**
......
......@@ -302,7 +302,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
$this->assertText(t('The changes have been saved.'));
// Check if image is displayed in user's profile page.
$this->assertRaw(file_create_url($picture_url), t("Image is displayed in user's profile page"));
$this->assertRaw(file_create_url($picture_path), t("Image is displayed in user's profile page"));
// Check if file is located in proper directory.
$this->assertTrue(is_file($picture_path), t('File is located in proper directory'));
......@@ -404,9 +404,10 @@ class UserPictureTestCase extends DrupalWebTestCase {
function saveUserPicture($image) {
$edit = array('files[picture_upload]' => realpath($image->filename));
$this->drupalPost('user/' . $this->user->uid.'/edit', $edit, t('Save'));
$img_info = image_get_info($image->filename);
$picture_dir = variable_get('user_picture_path', 'pictures');
$pic_path = file_directory_path() .'/'.$picture_dir .'/picture-'.$this->user->uid.'.jpg';
$pic_path = file_directory_path() . '/' . $picture_dir . '/picture-' . $this->user->uid . '.' . $img_info['extension'];
return $pic_path;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment