summaryrefslogtreecommitdiff
path: root/modules/file
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-06-30 22:37:49 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-06-30 22:37:49 +0000
commit0ed7c5051f468cf1537df8c9328873047b80ce21 (patch)
tree587f13d8555ba37bdee89ce09c6850ef0549b6fb /modules/file
parent9085e3ab226115cfcf65aec5ea05a33b15f549ff (diff)
downloadbrdo-0ed7c5051f468cf1537df8c9328873047b80ce21.tar.gz
brdo-0ed7c5051f468cf1537df8c9328873047b80ce21.tar.bz2
#841242 by justinrandell, Stevel: Fixed HEAD BROKEN: some file/image tests are failing.
Diffstat (limited to 'modules/file')
-rw-r--r--modules/file/tests/file.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test
index 562db0ae0..b228cb329 100644
--- a/modules/file/tests/file.test
+++ b/modules/file/tests/file.test
@@ -491,8 +491,8 @@ class FileFieldValidateTestCase extends FileFieldTestCase {
$field = field_info_field($field_name);
$instance = field_info_instance('node', $field_name, $type_name);
- // Get the test file (a GIF image).
$test_file = $this->getTestFile('image');
+ list(, $test_file_extension) = explode('.', $test_file->filename);
// Disable extension checking.
$this->updateFileField($field_name, $type_name, array('file_extensions' => ''));
@@ -513,7 +513,7 @@ class FileFieldValidateTestCase extends FileFieldTestCase {
$this->assertRaw($error_message, t('Node save failed when file uploaded with the wrong extension.'));
// Enable extension checking for text and image files.
- $this->updateFileField($field_name, $type_name, array('file_extensions' => 'txt gif'));
+ $this->updateFileField($field_name, $type_name, array('file_extensions' => "txt $test_file_extension"));
// Check that the file can be uploaded with extension checking.
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);