From 64d4a1d881ecf03a3ab16ea4b48c1f4fcc19e968 Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Mon, 23 Dec 2024 22:20:27 +0100 Subject: [PATCH] Fix whitespace in Tests output (#7364) * Fix whitespace in Tests output * Fix artifacts path * Fix whitespace in Tests output * Remove old code comment * Fix test --- .../humhub/components/i18n/Formatter.php | 36 +++++++++++++++++++ .../acceptance/RequestMembershipCest.php | 2 +- .../unit/widgets/TimeAgoWidgetTest.php | 8 ----- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/protected/humhub/components/i18n/Formatter.php b/protected/humhub/components/i18n/Formatter.php index 93fc3a4448..a86a278fe2 100644 --- a/protected/humhub/components/i18n/Formatter.php +++ b/protected/humhub/components/i18n/Formatter.php @@ -103,4 +103,40 @@ class Formatter extends \yii\i18n\Formatter return Yii::t('base', '{nFormatted}B', $params, $this->language); // Billion } } + + /** + * Fix unicode chars + * + * @param string $value + * @return string + */ + private function fixUnicodeChars($value): string + { + // Replace newly introduced Unicode separator whitespace, which a standard one, to sway backward compatible. + return str_replace(' ', ' ', $value); + } + + /** + * @inheritdoc + */ + public function asDate($value, $format = null) + { + return $this->fixUnicodeChars(parent::asDate($value, $format)); + } + + /** + * @inheritdoc + */ + public function asTime($value, $format = null) + { + return $this->fixUnicodeChars(parent::asTime($value, $format)); + } + + /** + * @inheritdoc + */ + public function asDatetime($value, $format = null) + { + return $this->fixUnicodeChars(parent::asDatetime($value, $format)); + } } diff --git a/protected/humhub/modules/space/tests/codeception/acceptance/RequestMembershipCest.php b/protected/humhub/modules/space/tests/codeception/acceptance/RequestMembershipCest.php index c37e242733..1bae1dd131 100644 --- a/protected/humhub/modules/space/tests/codeception/acceptance/RequestMembershipCest.php +++ b/protected/humhub/modules/space/tests/codeception/acceptance/RequestMembershipCest.php @@ -78,7 +78,7 @@ class RequestMembershipCest $I->waitForText('Members', null, '.controls-header'); $I->click('Members', '.controls-header'); - $I->waitForText('Manage members'); + $I->waitForText('Member since'); $I->see('Pending Approvals'); $I->click('Pending Approvals'); diff --git a/protected/humhub/tests/codeception/unit/widgets/TimeAgoWidgetTest.php b/protected/humhub/tests/codeception/unit/widgets/TimeAgoWidgetTest.php index e303b74e27..340ed47abe 100644 --- a/protected/humhub/tests/codeception/unit/widgets/TimeAgoWidgetTest.php +++ b/protected/humhub/tests/codeception/unit/widgets/TimeAgoWidgetTest.php @@ -88,10 +88,6 @@ class TimeAgoWidgetTest extends HumHubDbTestCase // TS outside of default 172800 but default deactivated $ts = (new DateTime())->setTime(12, 00, 00)->getTimestamp(); $result = TimeAgo::widget(['timestamp' => $ts, 'timeAgoBefore' => 1]); - - // Replace newly introduced Unicode separator whitespace, which a standard one, to sway backward compatible. - $result = str_replace(' ', ' ', $result); - $this->assertStringContainsString('12:00 PM', $result); } @@ -100,10 +96,6 @@ class TimeAgoWidgetTest extends HumHubDbTestCase // TS outside of default 172800 but default deactivated $ts = DateTime::createFromFormat('Y-m-d H:i:s', '2018-10-12 12:00:00')->getTimestamp(); $result = TimeAgo::widget(['timestamp' => $ts, 'hideTimeAfter' => false]); - - // Replace newly introduced Unicode separator whitespace, which a standard one, to sway backward compatible. - $result = str_replace(' ', ' ', $result); - $this->assertStringContainsString('Oct 12, 2018 - 12:00 PM', $result); }