From f512347e3378c3226cba0a28c52e9ed83351f4d1 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 16 Jul 2009 23:45:23 +0000 Subject: [PATCH] BUGFIX Making sure RequirementsTest? has combine_files activated (merged from branches/2.3-nzct) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82055 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/forms/RequirementsTest.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/forms/RequirementsTest.php b/tests/forms/RequirementsTest.php index c184e7789..a8aef3ad4 100644 --- a/tests/forms/RequirementsTest.php +++ b/tests/forms/RequirementsTest.php @@ -10,15 +10,19 @@ class RequirementsTest extends SapphireTest { static $html_template = ''; - function testCustomCSS() { - Requirements::customCSS(".testclass {color:#f00;}"); + protected $orig = array(); + + function setUp() { + parent::setUp(); - $html = Requirements::includeInHTML(false, self::$html_template); - - $this->assertTrue( - (strpos($html, '.testclass {color:#f00;}') !== false), - 'customCSS() shows up in template' - ); + $this->orig['SetCombineFiles'] = Requirements::get_combined_files_enabled(); + Requirements::set_combined_files_enabled(true); + } + + function tearDown() { + parent::tearDown(); + + Requirements::set_combined_files_enabled($this->orig['SetCombineFiles']); } function testExternalUrls() {