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

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
This commit is contained in:
Laurent Destailleur
2014-05-29 19:20:48 +02:00
parent f5a530e5d5 48bbcc6f4a
commit ccca46f380
34 changed files with 269 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/phpunit/FunctionsLibTest.php
View File

@@ -186,6 +186,9 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$input='xxx<br style="eee" >';
$after=dol_textishtml($input);
$this->assertTrue($after);
$input='<h2>abc</h2>';
$after=dol_textishtml($input);
$this->assertTrue($after);
// False
$input='xxx < br>';
@@ -594,16 +597,16 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
public function testVerifCond()
{
$verifcond=verifCond('1==1');
$this->assertTrue($verifcond);
$this->assertTrue($verifcond,'Test a true comparison');
$verifcond=verifCond('1==2');
$this->assertFalse($verifcond);
$this->assertFalse($verifcond,'Test a false comparison');
$verifcond=verifCond('$conf->facture->enabled');
$this->assertTrue($verifcond);
$this->assertTrue($verifcond,'Test that conf property of a module report true when enabled');
$verifcond=verifCond('$conf->moduledummy->enabled');
$this->assertFalse($verifcond);
$this->assertFalse($verifcond,'Test that conf property of a module report false when disabled');
$verifcond=verifCond('');
$this->assertTrue($verifcond);