From 541622f0096f82a395064f1825b99d43458f3d69 Mon Sep 17 00:00:00 2001 From: Svyatoslav Varpikhovsky Date: Wed, 9 Nov 2022 17:21:55 +0200 Subject: [PATCH] FRW-172 Upgrade to Codeception 5 (#9542) FRW-172 Codeception Upgrade to latest version --- codeception.yml | 2 +- .../SprykerTest/Shared/Router/codeception.yml | 4 ++-- tests/SprykerTest/Yves/Router/codeception.yml | 4 ++-- .../Router/_support/Helper/RouterHelper.php | 19 ++++++++++++------- .../_support/Helper/RouterHelperTrait.php | 4 +++- tests/SprykerTest/Zed/Router/codeception.yml | 6 +++--- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/codeception.yml b/codeception.yml index 78324dc..6ec15c6 100644 --- a/codeception.yml +++ b/codeception.yml @@ -6,7 +6,7 @@ include: paths: tests: tests - log: tests/_output + output: tests/_output data: tests/_data support: tests/_support envs: tests/_envs diff --git a/tests/SprykerTest/Shared/Router/codeception.yml b/tests/SprykerTest/Shared/Router/codeception.yml index 4078c6a..dbbff66 100644 --- a/tests/SprykerTest/Shared/Router/codeception.yml +++ b/tests/SprykerTest/Shared/Router/codeception.yml @@ -4,7 +4,7 @@ paths: tests: . data: ../../../_data support: _support - log: ../../../_output + output: ../../../_output coverage: enabled: true @@ -14,7 +14,7 @@ coverage: suites: Shared: path: . - class_name: RouterTester + actor: RouterTester modules: enabled: - Asserts diff --git a/tests/SprykerTest/Yves/Router/codeception.yml b/tests/SprykerTest/Yves/Router/codeception.yml index 1cd6b4a..451b3ff 100644 --- a/tests/SprykerTest/Yves/Router/codeception.yml +++ b/tests/SprykerTest/Yves/Router/codeception.yml @@ -4,7 +4,7 @@ paths: tests: . data: ../../../_data support: _support - log: ../../../_output + output: ../../../_output coverage: enabled: true @@ -14,7 +14,7 @@ coverage: suites: Yves: path: . - class_name: RouterYvesTester + actor: RouterYvesTester modules: enabled: - Asserts diff --git a/tests/SprykerTest/Zed/Router/_support/Helper/RouterHelper.php b/tests/SprykerTest/Zed/Router/_support/Helper/RouterHelper.php index 3dc95ce..331f357 100644 --- a/tests/SprykerTest/Zed/Router/_support/Helper/RouterHelper.php +++ b/tests/SprykerTest/Zed/Router/_support/Helper/RouterHelper.php @@ -25,6 +25,7 @@ use Spryker\Zed\RouterExtension\Dependency\Plugin\RouterPluginInterface; use SprykerTest\Service\Container\Helper\ContainerHelperTrait; use SprykerTest\Shared\Testify\Helper\ConfigHelperTrait; +use SprykerTest\Shared\Testify\Helper\ModuleHelperConfigTrait; use SprykerTest\Zed\Application\Helper\ApplicationHelperTrait; use SprykerTest\Zed\EventDispatcher\Helper\EventDispatcherHelperTrait; use SprykerTest\Zed\Testify\Helper\Business\BusinessHelperTrait; @@ -41,6 +42,7 @@ class RouterHelper extends Module use DependencyProviderHelperTrait; use EventDispatcherHelperTrait; use ContainerHelperTrait; + use ModuleHelperConfigTrait; /** * @var string @@ -57,13 +59,6 @@ class RouterHelper extends Module */ protected $routerPlugins = []; - /** - * @var array - */ - protected $config = [ - self::CONFIG_KEY_ROUTER_PLUGINS => [], - ]; - /** * @uses \Spryker\Zed\Router\Communication\Plugin\Application\RouterApplicationPlugin::SERVICE_ROUTER * @@ -103,6 +98,16 @@ public function _initialize(): void Request::setFactory($requestFactory); } + /** + * @return void + */ + protected function setDefaultConfig(): void + { + $this->config = [ + static::CONFIG_KEY_ROUTER_PLUGINS => [], + ]; + } + /** * @return \Spryker\Zed\RouterExtension\Dependency\Plugin\RouterPluginInterface */ diff --git a/tests/SprykerTest/Zed/Router/_support/Helper/RouterHelperTrait.php b/tests/SprykerTest/Zed/Router/_support/Helper/RouterHelperTrait.php index e3f0bfb..0c2015b 100644 --- a/tests/SprykerTest/Zed/Router/_support/Helper/RouterHelperTrait.php +++ b/tests/SprykerTest/Zed/Router/_support/Helper/RouterHelperTrait.php @@ -7,6 +7,8 @@ namespace SprykerTest\Zed\Router\Helper; +use Codeception\Module; + trait RouterHelperTrait { /** @@ -25,5 +27,5 @@ protected function getRouterHelper(): RouterHelper * * @return \Codeception\Module */ - abstract protected function getModule($name); + abstract protected function getModule(string $name): Module; } diff --git a/tests/SprykerTest/Zed/Router/codeception.yml b/tests/SprykerTest/Zed/Router/codeception.yml index 023b96b..b01ab23 100644 --- a/tests/SprykerTest/Zed/Router/codeception.yml +++ b/tests/SprykerTest/Zed/Router/codeception.yml @@ -4,7 +4,7 @@ paths: tests: . data: ../../../_data support: _support - log: ../../../_output + output: ../../../_output coverage: enabled: true @@ -14,7 +14,7 @@ coverage: suites: Base: path: ./Root - class_name: RouterRootTester + actor: RouterRootTester modules: enabled: - \SprykerTest\Shared\Testify\Helper\Environment @@ -22,7 +22,7 @@ suites: Communication: path: ./Communication - class_name: RouterCommunicationTester + actor: RouterCommunicationTester modules: enabled: - Asserts