mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 06:08:21 +01:00
Fix whitespace in Tests output
This commit is contained in:
parent
d65bd7d5b7
commit
6195823aef
2
.github/workflows/php-test.yml
vendored
2
.github/workflows/php-test.yml
vendored
@ -139,4 +139,4 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: codeception-output
|
name: codeception-output
|
||||||
path: tests/codeception/_output/*
|
path: protected/humhub/tests/codeception/_output/*
|
||||||
|
@ -103,4 +103,40 @@ class Formatter extends \yii\i18n\Formatter
|
|||||||
return Yii::t('base', '{nFormatted}B', $params, $this->language); // Billion
|
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));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ class ScheduledCest
|
|||||||
{
|
{
|
||||||
return $datetime instanceof DateTime
|
return $datetime instanceof DateTime
|
||||||
// Replace newly introduced Unicode separator whitespace, which a standard one, to sway backward compatible.
|
// Replace newly introduced Unicode separator whitespace, which a standard one, to sway backward compatible.
|
||||||
? 'SCHEDULED FOR ' . str_replace(' ', ' ', Yii::$app->formatter->asDatetime($datetime, self::DATE_FORMAT))
|
? 'SCHEDULED FOR ' . Yii::$app->formatter->asDatetime($datetime, self::DATE_FORMAT)
|
||||||
: 'DRAFT';
|
: 'DRAFT';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,10 +88,6 @@ class TimeAgoWidgetTest extends HumHubDbTestCase
|
|||||||
// TS outside of default 172800 but default deactivated
|
// TS outside of default 172800 but default deactivated
|
||||||
$ts = (new DateTime())->setTime(12, 00, 00)->getTimestamp();
|
$ts = (new DateTime())->setTime(12, 00, 00)->getTimestamp();
|
||||||
$result = TimeAgo::widget(['timestamp' => $ts, 'timeAgoBefore' => 1]);
|
$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</time>', $result);
|
$this->assertStringContainsString('12:00 PM</time>', $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,10 +96,6 @@ class TimeAgoWidgetTest extends HumHubDbTestCase
|
|||||||
// TS outside of default 172800 but default deactivated
|
// TS outside of default 172800 but default deactivated
|
||||||
$ts = DateTime::createFromFormat('Y-m-d H:i:s', '2018-10-12 12:00:00')->getTimestamp();
|
$ts = DateTime::createFromFormat('Y-m-d H:i:s', '2018-10-12 12:00:00')->getTimestamp();
|
||||||
$result = TimeAgo::widget(['timestamp' => $ts, 'hideTimeAfter' => false]);
|
$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</time>', $result);
|
$this->assertStringContainsString('Oct 12, 2018 - 12:00 PM</time>', $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user