From 904776e5df724037cf694cd4638a1067a7423149 Mon Sep 17 00:00:00 2001 From: Pham Thanh Thao Date: Mon, 26 Feb 2024 09:41:27 +0700 Subject: [PATCH] Set expected message based on eccube version --- Tests/Web/Admin/ProductMakerTest.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Tests/Web/Admin/ProductMakerTest.php b/Tests/Web/Admin/ProductMakerTest.php index 08ac088..7877b7c 100644 --- a/Tests/Web/Admin/ProductMakerTest.php +++ b/Tests/Web/Admin/ProductMakerTest.php @@ -14,6 +14,7 @@ namespace Plugin\Maker42\Tests\Web\Admin; use Faker\Generator; +use Eccube\Common\Constant; use Plugin\Maker42\Tests\Web\MakerWebCommon; use Symfony\Component\HttpKernel\Client; use Symfony\Component\DomCrawler\Crawler; @@ -146,7 +147,9 @@ public function testProductNewWithAddMakerInvalid() $errorMessages = $crawler->filter('.form-error-message')->each(function (Crawler $node): string { return $node->text(); }); - $this->assertStringContainsString('選択した値は無効です。', implode("\n", $errorMessages)); + $versionParts = explode('-', Constant::VERSION); + $expectedMessage = version_compare(reset($versionParts), '4.3.0', '<') ? '有効な値ではありません。' : '選択した値は無効です。'; + $this->assertStringContainsString($expectedMessage, implode("\n", $errorMessages)); // Check database $Product = $this->productRepository->findOneBy([], ['id' => 'DESC']); @@ -417,7 +420,9 @@ public function testProductEditWithAddMakerInvalid() $errorMessages = $crawler->filter('.form-error-message')->each(function (Crawler $node): string { return $node->text(); }); - $this->assertStringContainsString('選択した値は無効です。', implode("\n", $errorMessages)); + $versionParts = explode('-', Constant::VERSION); + $expectedMessage = version_compare(reset($versionParts), '4.3.0', '<') ? '有効な値ではありません。' : '選択した値は無効です。'; + $this->assertStringContainsString($expectedMessage, implode("\n", $errorMessages)); // Check database $Product = $this->productRepository->findOneBy([], ['id' => 'DESC']);