composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-30 14:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

💚 N°2538 Fix test

Browse Source 
Was broken since ce207e5c
This commit is contained in:
Pierre Goiffon
2019-10-17 10:41:49 +02:00
parent 0a2063ce69
commit 0d0f8e9ffc
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/application/UtilsTest.php
View File

@@ -23,6 +23,7 @@
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
* @backupGlobals disabled
* @covers utils
*/
class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
{
@@ -58,6 +59,7 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
/**
* @dataProvider realPathDataProvider
* @covers utils::RealPath()
*/
public function testRealPath($sPath, $sBasePath, $expected)
{
@@ -68,30 +70,30 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
{
parent::setUp(); // if not called, APPROOT won't be defined :(
$sItopRootPath = APPROOT;
$sSep = DIRECTORY_SEPARATOR;
$sItopRootRealPath = realpath(APPROOT).$sSep;
return [
'licence.txt' => [$sItopRootPath.'license.txt', $sItopRootPath, $sItopRootPath.'license.txt'],
'unexisting file' => [$sItopRootPath.'license_DOES_NOT_EXIST.txt', $sItopRootPath, false],
'/license.txt' => [$sItopRootPath.$sSep.'license.txt', $sItopRootPath, $sItopRootPath.'license.txt'],
'%2flicense.txt' => [$sItopRootPath.'%2flicense.txt', $sItopRootPath, false],
'../license.txt' => [$sItopRootPath.'..'.$sSep.'license.txt', $sItopRootPath, false],
'%2e%2e%2flicense.txt' => [$sItopRootPath.'%2e%2e%2flicense.txt', $sItopRootPath, false],
'licence.txt' => [APPROOT.'license.txt', APPROOT, $sItopRootRealPath.'license.txt'],
'unexisting file' => [APPROOT.'license_DOES_NOT_EXIST.txt', APPROOT, false],
'/license.txt' => [APPROOT.$sSep.'license.txt', APPROOT, $sItopRootRealPath.'license.txt'],
'%2flicense.txt' => [APPROOT.'%2flicense.txt', APPROOT, false],
'../license.txt' => [APPROOT.'..'.$sSep.'license.txt', APPROOT, false],
'%2e%2e%2flicense.txt' => [APPROOT.'%2e%2e%2flicense.txt', APPROOT, false],
'application/utils.inc.php with basepath=APPROOT' => [
$sItopRootPath.'application/utils.inc.php',
$sItopRootPath,
$sItopRootPath.'application'.$sSep.'utils.inc.php',
APPROOT.'application/utils.inc.php',
APPROOT,
$sItopRootRealPath.'application'.$sSep.'utils.inc.php',
],
'application/utils.inc.php with basepath=APPROOT/application' => [
$sItopRootPath.'application/utils.inc.php',
$sItopRootPath.'application',
$sItopRootPath.'application'.$sSep.'utils.inc.php',
APPROOT.'application/utils.inc.php',
APPROOT.'application',
$sItopRootRealPath.'application'.$sSep.'utils.inc.php',
],
'basepath containing / and \\' => [
$sItopRootPath.'sources/form/form.class.inc.php',
$sItopRootPath.'sources/form\\form.class.inc.php',
$sItopRootPath.'sources'.$sSep.'form'.$sSep.'form.class.inc.php',
APPROOT.'sources/form/form.class.inc.php',
APPROOT.'sources/form\\form.class.inc.php',
$sItopRootRealPath.'sources'.$sSep.'form'.$sSep.'form.class.inc.php',
],
];
}