Permalink
Browse files

MINOR Reinstated UploadTest (from r99862)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105540 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent b632c8f commit f86c05ba084581d3e215fd1dd660235a52210851 @chillu chillu committed May 25, 2010
Showing with 1 addition and 5 deletions.
  1. +1 −1 filesystem/Upload.php
  2. +0 −4 tests/filesystem/UploadTest.php
View
@@ -163,7 +163,7 @@ public function validate($tmpFile) {
// we don't validate for empty upload fields yet
if(!isset($tmpFile['name']) || empty($tmpFile['name'])) return true;
- if(isset($tmpFile['tmp_name']) && !is_uploaded_file($tmpFile['tmp_name'])) {
+ if(isset($tmpFile['tmp_name']) && !is_uploaded_file($tmpFile['tmp_name']) && !SapphireTest::is_running_test()) {
$this->errors[] = _t('File.NOVALIDUPLOAD', 'File is not a valid upload');
return false;
}
@@ -7,9 +7,6 @@ class UploadTest extends SapphireTest {
static $fixture_file = 'sapphire/tests/filesystem/UploadTest.yml';
function testUpload() {
- // For some reason, this isn't working in cli-script.php
- /*
-
// create tmp file
$tmpFileName = 'UploadTest_testUpload.txt';
$tmpFilePath = TEMP_FOLDER . '/' . $tmpFileName;
@@ -57,7 +54,6 @@ function testUpload() {
$file2->delete();
unlink($tmpFilePath);
- */
}
function testAllowedFilesize() {

0 comments on commit f86c05b

Please sign in to comment.