From bb6283740a3f67ec71b35c6dbe3c048161dd8069 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 13 May 2013 23:39:52 +1200 Subject: [PATCH] Fixing broken CoreTest when using silverstripe-cache for temp folder --- tests/core/CoreTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/core/CoreTest.php b/tests/core/CoreTest.php index 73e10ffa5..fe084f278 100644 --- a/tests/core/CoreTest.php +++ b/tests/core/CoreTest.php @@ -16,11 +16,11 @@ class CoreTest extends SapphireTest { } public function testGetTempPathInProject() { - if(file_exists($this->tempPath)) { - $this->assertEquals(getTempFolder(BASE_PATH), $this->tempPath); - } else { - $user = getTempFolderUsername(); + $user = getTempFolderUsername(); + if(file_exists($this->tempPath)) { + $this->assertEquals(getTempFolder(BASE_PATH), $this->tempPath . '/' . $user); + } else { // A typical Windows location for where sites are stored on IIS $this->assertEquals(sys_get_temp_dir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project/' . $user, getTempFolder('C:\\inetpub\\wwwroot\\silverstripe-test-project'));