From 8673b11cd9f250c97263db4cafcb15afb21e4116 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 29 Apr 2014 08:57:23 +1200 Subject: [PATCH] BUG Fix ImageTest Image test would erroneously reset the Image::$backend to null if the test was skipped, breaking subsequent test cases --- tests/model/ImageTest.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/model/ImageTest.php b/tests/model/ImageTest.php index 8ec1e28ee..fcdb933cd 100644 --- a/tests/model/ImageTest.php +++ b/tests/model/ImageTest.php @@ -11,15 +11,14 @@ class ImageTest extends SapphireTest { protected $origBackend; public function setUp() { - if(get_class($this) == "ImageTest") - $this->skipTest = true; + if(get_class($this) == "ImageTest") $this->skipTest = true; parent::setUp(); + $this->origBackend = Image::get_backend(); + if($this->skipTest) return; - - $this->origBackend = Image::get_backend(); if(!file_exists(ASSETS_PATH)) mkdir(ASSETS_PATH); @@ -34,7 +33,7 @@ class ImageTest extends SapphireTest { } public function tearDown() { - Image::set_backend($this->origBackend); + if($this->origBackend) Image::set_backend($this->origBackend); /* Remove the test files that we've created */ $fileIDs = $this->allFixtureIDs('Image');