Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
This commit is contained in:
Laurent Destailleur
2016-10-31 21:31:57 +01:00
parent 90b138a504 ffe4ae5915
commit a658b7cc3d
11 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/phpunit/FunctionsLibTest.php
View File

@@ -119,6 +119,32 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
}
/**
* testDolBuildPath
*
* @return boolean
*/
public function testDolBuildPath()
{
/*$tmp=dol_buildpath('/google/oauth2callback.php', 0);
var_dump($tmp);
*/
/*$tmp=dol_buildpath('/google/oauth2callback.php', 1);
var_dump($tmp);
*/
$result=dol_buildpath('/google/oauth2callback.php', 2);
print __METHOD__." result=".$result."\n";
$this->assertStringStartsWith('http', $result);
$result=dol_buildpath('/google/oauth2callback.php', 3);
print __METHOD__." result=".$result."\n";
$this->assertStringStartsWith('http', $result);
}
/**
* testGetBrowserInfo
*
@@ -1009,5 +1035,5 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
return true;
}
}