Skip to content

Commit 377e661

Browse files
committed
Merge remote-tracking branch 'origin/MC-32938' into 2.4-develop-pr18
2 parents f9a0eb4 + 65543b4 commit 377e661

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,16 @@ public function testGtmOffset()
5050
{
5151
/** @var TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject $timezone */
5252
$timezone = $this->getMockBuilder(TimezoneInterface::class)->getMock();
53-
$timezone->method('getConfigTimezone')->willReturn('Europe/Amsterdam');
53+
// Asia/Tbilisi timezone have no DST
54+
$timezone->method('getConfigTimezone')->willReturn('Asia/Tbilisi');
5455

5556
/** @var DateTime|\PHPUnit_Framework_MockObject_MockObject $dateTime */
5657
$dateTime = $this->getMockBuilder(DateTime::class)
5758
->setConstructorArgs([$timezone])
5859
->setMethods(null)
5960
->getMock();
6061

61-
$this->assertEquals(3600, $dateTime->getGmtOffset());
62+
$this->assertEquals(14400, $dateTime->getGmtOffset());
6263
}
6364

6465
/**

0 commit comments

Comments
 (0)