From 9cd40767f68859adb67db5228467eb107d9fc65d Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 11 Oct 2010 20:10:04 +0000 Subject: [PATCH] MINOR #6090 FilesystemPublisherTest now stores temporary files in assets, which is writable, instead of the webroot which almost never has write permissions git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111883 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/FilesystemPublisherTest.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/FilesystemPublisherTest.php b/tests/FilesystemPublisherTest.php index 001f3621..1407a3b9 100644 --- a/tests/FilesystemPublisherTest.php +++ b/tests/FilesystemPublisherTest.php @@ -14,7 +14,7 @@ class FilesystemPublisherTest extends SapphireTest { function setUp() { parent::setUp(); - Object::add_extension("SiteTree", "FilesystemPublisher('../FilesystemPublisherTest-static-folder/')"); + Object::add_extension("SiteTree", "FilesystemPublisher('assets/FilesystemPublisherTest-static-folder/')"); SiteTree::$write_homepage_map = false; $this->orig['domain_based_caching'] = FilesystemPublisher::$domain_based_caching; @@ -22,9 +22,23 @@ class FilesystemPublisherTest extends SapphireTest { } function tearDown() { - Object::remove_extension("SiteTree", "FilesystemPublisher('../FilesystemPublisherTest-static-folder/')"); + Object::remove_extension("SiteTree", "FilesystemPublisher('assets/FilesystemPublisherTest-static-folder/')"); SiteTree::$write_homepage_map = true; + $basePath = '../assets/FilesystemPublisherTest-static-folder'; + if(file_exists($basePath)) { + $dir = opendir($basePath);; + while($file = readdir($dir)) { + $path = Director::baseFolder() . '/assets/FilesystemPublisherTest-static-folder/' . $file; + if(is_dir($path)) continue; + else { + unlink($path); + } + } + closedir($dir); + rmdir($basePath); + } + FilesystemPublisher::$domain_based_caching = $this->orig['domain_based_caching']; parent::tearDown();