Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michal Čihař 2012-07-18 15:34:04 +02:00
commit 4199e41f47

View File

@ -65,7 +65,7 @@ class PMA_Error_test extends PHPUnit_Framework_TestCase
*/
public function testSetFile(){
$this->object->setFile('./pma.txt');
$this->assertEquals('./../../../../..', $this->object->getFile());
$this->assertStringStartsWith('./../../', $this->object->getFile());
}
/**