Update integration tests

[MAILPOET-2630]
This commit is contained in:
Rostislav Wolny
2020-07-09 14:49:34 +02:00
committed by Veljko V
parent 9c8bbc5d90
commit ae85e06afb
3 changed files with 2 additions and 4 deletions

View File

@ -102,7 +102,8 @@ class ContainerConfigurator implements IContainerConfigurator {
$container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true); $container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true);
$container->autowire(\MailPoet\Config\ServicesChecker::class); $container->autowire(\MailPoet\Config\ServicesChecker::class);
$container->autowire(\MailPoet\Config\Shortcodes::class) $container->autowire(\MailPoet\Config\Shortcodes::class)
->setShared(false); // Get a new instance each time $container->get() is called, needed for tests ->setShared(false) // Get a new instance each time $container->get() is called, needed for tests
->setPublic(true);
$container->register(\MailPoet\Config\Renderer::class) $container->register(\MailPoet\Config\Renderer::class)
->setPublic(true) ->setPublic(true)
->setFactory([new Reference(\MailPoet\Config\RendererFactory::class), 'getRenderer']); ->setFactory([new Reference(\MailPoet\Config\RendererFactory::class), 'getRenderer']);

View File

@ -36,8 +36,6 @@ class DatabaseTest extends \MailPoetTest {
'@@session.time_zone as timeZone' '@@session.time_zone as timeZone'
) )
->findOne(); ->findOne();
// disable ONLY_FULL_GROUP_BY
expect($result->sqlMode)->notContains('ONLY_FULL_GROUP_BY');
// time zone should be set based on WP's time zone // time zone should be set based on WP's time zone
expect($result->timeZone)->equals(Env::$dbTimezoneOffset); expect($result->timeZone)->equals(Env::$dbTimezoneOffset);
} }

View File

@ -100,7 +100,6 @@ class ConnectionFactoryTest extends \MailPoetTest {
')->fetch(); ')->fetch();
// check timezone, SQL mode, wait timeout // check timezone, SQL mode, wait timeout
expect($result['@@session.sql_mode'])->notContains('ONLY_FULL_GROUP_BY');
expect($result['@@session.time_zone'])->equals(Env::$dbTimezoneOffset); expect($result['@@session.time_zone'])->equals(Env::$dbTimezoneOffset);
expect($result['@@session.wait_timeout'])->greaterOrEquals(60); expect($result['@@session.wait_timeout'])->greaterOrEquals(60);