aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-11-02 19:42:20 +0100
committerGitHub <noreply@github.com>2020-11-02 19:42:20 +0100
commitb7ec15790e88959d8026df8a5e68e523d03522c7 (patch)
tree42c37b85fe5084a65c65ffcacef7a11b782baaf5
parentdff039092d180fffa89e7d88f7a4b7bc24dfc80f (diff)
parentb862705947ff14f54023ba6d1cbead3435d0f234 (diff)
downloadShaarli-b7ec15790e88959d8026df8a5e68e523d03522c7.tar.gz
Shaarli-b7ec15790e88959d8026df8a5e68e523d03522c7.tar.zst
Shaarli-b7ec15790e88959d8026df8a5e68e523d03522c7.zip
Merge pull request #1618 from ArthurHoaro/fix/ut-daily-date-1-digit
UT: fix formatting issue when the current day has a single digit
-rw-r--r--tests/front/controller/visitor/DailyControllerTest.php2
-rw-r--r--tests/helper/DailyPageHelperTest.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/front/controller/visitor/DailyControllerTest.php b/tests/front/controller/visitor/DailyControllerTest.php
index 758e7219..70fbce54 100644
--- a/tests/front/controller/visitor/DailyControllerTest.php
+++ b/tests/front/controller/visitor/DailyControllerTest.php
@@ -327,7 +327,7 @@ class DailyControllerTest extends TestCase
327 static::assertSame(200, $result->getStatusCode()); 327 static::assertSame(200, $result->getStatusCode());
328 static::assertSame('daily', (string) $result->getBody()); 328 static::assertSame('daily', (string) $result->getBody());
329 static::assertCount(0, $assignedVariables['linksToDisplay']); 329 static::assertCount(0, $assignedVariables['linksToDisplay']);
330 static::assertSame('Today - ' . (new \DateTime())->format('F d, Y'), $assignedVariables['dayDesc']); 330 static::assertSame('Today - ' . (new \DateTime())->format('F j, Y'), $assignedVariables['dayDesc']);
331 static::assertEquals((new \DateTime())->setTime(0, 0)->getTimestamp(), $assignedVariables['day']); 331 static::assertEquals((new \DateTime())->setTime(0, 0)->getTimestamp(), $assignedVariables['day']);
332 static::assertEquals((new \DateTime())->setTime(0, 0), $assignedVariables['dayDate']); 332 static::assertEquals((new \DateTime())->setTime(0, 0), $assignedVariables['dayDate']);
333 } 333 }
diff --git a/tests/helper/DailyPageHelperTest.php b/tests/helper/DailyPageHelperTest.php
index e0378491..5255b7b1 100644
--- a/tests/helper/DailyPageHelperTest.php
+++ b/tests/helper/DailyPageHelperTest.php
@@ -240,8 +240,8 @@ class DailyPageHelperTest extends TestCase
240 public function getDescriptionsByType(): array 240 public function getDescriptionsByType(): array
241 { 241 {
242 return [ 242 return [
243 [DailyPageHelper::DAY, $date = new \DateTimeImmutable(), 'Today - ' . $date->format('F d, Y')], 243 [DailyPageHelper::DAY, $date = new \DateTimeImmutable(), 'Today - ' . $date->format('F j, Y')],
244 [DailyPageHelper::DAY, $date = new \DateTimeImmutable('-1 day'), 'Yesterday - ' . $date->format('F d, Y')], 244 [DailyPageHelper::DAY, $date = new \DateTimeImmutable('-1 day'), 'Yesterday - ' . $date->format('F j, Y')],
245 [DailyPageHelper::DAY, new \DateTimeImmutable('2020-10-09 04:05:06'), 'October 9, 2020'], 245 [DailyPageHelper::DAY, new \DateTimeImmutable('2020-10-09 04:05:06'), 'October 9, 2020'],
246 [DailyPageHelper::WEEK, new \DateTimeImmutable('2020-10-09 04:05:06'), 'Week 41 (October 5, 2020)'], 246 [DailyPageHelper::WEEK, new \DateTimeImmutable('2020-10-09 04:05:06'), 'Week 41 (October 5, 2020)'],
247 [DailyPageHelper::MONTH, new \DateTimeImmutable('2020-10-09 04:05:06'), 'October, 2020'], 247 [DailyPageHelper::MONTH, new \DateTimeImmutable('2020-10-09 04:05:06'), 'October, 2020'],