composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source
This commit is contained in:
Stephen Abello
2025-09-18 10:13:09 +02:00
parent d589d9d05a bf7a756714
commit 7e515e7216
619 changed files with 20218 additions and 81084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/php-unit-tests/unitary-tests/core/EMailTest.php
View File

@@ -39,7 +39,7 @@ class EMailTest extends ItopTestCase {
// Check if our charset is correctly set
// We know this file may be used by other future test, but as we can't configure output filename, it is what it is
$sEmailContent = file_get_contents(APPROOT.'log/mail.log');
$this->assertStringContainsString('charset="UTF-8"', $sEmailContent);
$this->assertStringContainsStringIgnoringCase('charset=UTF-8', $sEmailContent);
// Set our previous email transport value back, so it doesn't affect other tests
$oConfig->Set('email_transport', $sCurrentEmailTransport);
@@ -78,7 +78,7 @@ class EMailTest extends ItopTestCase {
// Check if our charset is correctly set
// We know this file may be used by other future test, but as we can't configure output filename, it is what it is
$sEmailContent = file_get_contents(APPROOT.'log/mail.log');
$this->assertStringContainsString('Content-Type: text/plain; charset=UTF-8', $sEmailContent);
$this->assertStringContainsStringIgnoringCase('Content-Type: text/plain; charset=UTF-8', $sEmailContent);
// Set our previous email transport value back, so it doesn't affect other tests
$oConfig->Set('email_transport', $sCurrentEmailTransport);

4
tests/php-unit-tests/unitary-tests/sources/core/Email/EmailLaminasTest.php → tests/php-unit-tests/unitary-tests/sources/core/Email/EmailSymfonyTest.php
View File

@@ -2,7 +2,7 @@
use Combodo\iTop\Test\UnitTest\ItopTestCase;
class EmailLaminasTest extends ItopTestCase
class EmailSymfonyTest extends ItopTestCase
{
public function testInlineCssIntoBodyContent(): void
{
@@ -131,7 +131,7 @@ CSS;
HTML;
$sExpectedBody .= "\n"; // Emogriffer is always adding latest line feed, adding it in expected content !
$sActualBody = $this->InvokeNonPublicStaticMethod(EMailLaminas::class, 'InlineCssIntoBodyContent', [$sInputBody, $sInputCss]);
$sActualBody = $this->InvokeNonPublicStaticMethod(EMailSymfony::class, 'InlineCssIntoBodyContent', [$sInputBody, $sInputCss]);
$this->assertSame($sExpectedBody, $sActualBody);
}