diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index 4e1ee3e883..63f620511a 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -39,6 +39,7 @@ class ThemeTest extends PMATestCase $GLOBALS['text_dir'] = 'ltr'; include 'themes/pmahomme/layout.inc.php'; $GLOBALS['server'] = '99'; + $GLOBALS['collation_connection'] = 'utf-8'; } /** @@ -123,6 +124,39 @@ class ThemeTest extends PMATestCase $this->assertNotNull($newTheme); } + /** + * Test for Theme::loadCss + * + * @param $theme string Path to theme files + * + * @return void + * + * @dataProvider listThemes + */ + public function testLoadCss($theme) + { + $newTheme = Theme::load($theme); + ob_start(); + $ret = $newTheme->loadCss(); + $out = ob_get_contents(); + ob_end_clean(); + $this->assertTrue($ret); + $this->assertContains('FILE: navigation.css.php', $out); + } + + /** + * Data provider for Theme::loadCss test + * + * @return array with theme paths + */ + public function listThemes() + { + return array( + array('./themes/original'), + array('./themes/pmahomme/'), + ); + } + /** * Test for Theme::load * diff --git a/themes/sprites.css.php b/themes/sprites.css.php index f458077eea..768804ed73 100644 --- a/themes/sprites.css.php +++ b/themes/sprites.css.php @@ -7,7 +7,7 @@ */ // unplanned execution path -if (! defined('PMA_MINIMUM_COMMON')) { +if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { exit(); }