lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ajaxtooltip

Browse Source
This commit is contained in:
Frédéric FRANCE 2023-03-28 20:34:47 +02:00
commit 27f81b7ce9
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/phpunit/AllTests.php
View File

@ -277,7 +277,7 @@ class AllTests
// Website // Website
require_once dirname(__FILE__).'/WebsiteTest.php'; require_once dirname(__FILE__).'/WebsiteTest.php';
$suite->addTestSuite('Website'); $suite->addTestSuite('WebsiteTest');
return $suite; return $suite;
} }

21
test/phpunit/WebsiteTest.class.php → test/phpunit/WebsiteTest.php
View File

@ -55,6 +55,7 @@ if (! defined("NOSESSION")) {
require_once dirname(__FILE__).'/../../htdocs/main.inc.php'; require_once dirname(__FILE__).'/../../htdocs/main.inc.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/website.lib.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/website.lib.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/website2.lib.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/website2.lib.php';
require_once dirname(__FILE__).'/../../htdocs/website/class/website.class.php';
if (empty($user->id)) { if (empty($user->id)) {
@ -110,7 +111,7 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
* *
* @return void * @return void
*/ */
public static function setUpBeforeClass() public static function setUpBeforeClass(): void
{ {
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
$db->begin(); // This is to have all actions inside a transaction even if test launched without suite. $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
@ -123,7 +124,7 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
* *
* @return void * @return void
*/ */
public static function tearDownAfterClass() public static function tearDownAfterClass(): void
{ {
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
$db->rollback(); $db->rollback();
@ -136,7 +137,7 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
* *
* @return void * @return void
*/ */
protected function setUp() protected function setUp(): void
{ {
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
$conf=$this->savconf; $conf=$this->savconf;
@ -152,7 +153,7 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
* *
* @return void * @return void
*/ */
protected function tearDown() protected function tearDown(): void
{ {
print __METHOD__."\n"; print __METHOD__."\n";
} }
@ -165,14 +166,16 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
*/ */
public function testGetPagesFromSearchCriterias() public function testGetPagesFromSearchCriterias()
{ {
global $db; global $db, $website;
$website = new Website($db); // $website must be defined globally for getPagesFromSearchCriterias()
$s = "123') OR 1=1-- \' xxx"; $s = "123') OR 1=1-- \' xxx";
/* /*
var_dump($s); var_dump($s);
var_dump($db->escapeforlike($s)); var_dump($db->escapeforlike($s));
var_dump($db->escape($db->escapeforlike($s))); var_dump($db->escape($db->escapeforlike($s)));
*/ */
$res = getPagesFromSearchCriterias('page,blogpost', 'meta,content', $s, 2, 'date_creation', 'DESC', 'en'); $res = getPagesFromSearchCriterias('page,blogpost', 'meta,content', $s, 2, 'date_creation', 'DESC', 'en');
//var_dump($res); //var_dump($res);