Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michal Čihař 2012-07-03 10:54:48 +02:00
commit 55f405eb88

View File

@ -213,16 +213,10 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
$this->assertEquals('/new/path', $this->object->getImgPath());
}
public function testLoadCssWrongType()
public function testLoadCss()
{
$type = 'middle';
$this->assertFalse($this->object->loadCss($type));
}
public function testLoadCssNotExisted()
{
$type = 'print';
$this->assertFalse($this->object->loadCss($type));
$this->expectOutputRegex('/.*FILE: codemirror.css.php.*/');
$this->assertTrue($this->object->loadCss());
}
/**