Skip to content

Commit 0c508ef

Browse files
committed
MC-35771: Datepicker/calendar control does not use the store locale
1 parent 2588d77 commit 0c508ef

File tree

1 file changed

+58
-1
lines changed
  • app/code/Magento/Customer/Test/Unit/Block/Widget

1 file changed

+58
-1
lines changed

app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Magento\Framework\Data\Form\FilterFactory;
1818
use Magento\Framework\Escaper;
1919
use Magento\Framework\Exception\NoSuchEntityException;
20+
use Magento\Framework\Json\EncoderInterface;
2021
use Magento\Framework\Locale\Resolver;
2122
use Magento\Framework\Locale\ResolverInterface;
2223
use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
@@ -91,6 +92,11 @@ class DobTest extends TestCase
9192
*/
9293
private $_locale;
9394

95+
/**
96+
* @var EncoderInterface
97+
*/
98+
private $encoder;
99+
94100
/**
95101
* @inheritDoc
96102
*/
@@ -157,12 +163,16 @@ function () use ($timezone, $localeResolver) {
157163
}
158164
);
159165

166+
$this->encoder = $this->getMockForAbstractClass(EncoderInterface::class);
167+
160168
$this->_block = new Dob(
161169
$this->context,
162170
$this->createMock(Address::class),
163171
$this->customerMetadata,
164172
$this->createMock(Date::class),
165-
$this->filterFactory
173+
$this->filterFactory,
174+
[],
175+
$this->encoder
166176
);
167177
}
168178

@@ -598,4 +608,51 @@ public function testGetHtmlExtraParamsWithRequiredOption()
598608
$this->_block->getHtmlExtraParams()
599609
);
600610
}
611+
612+
/**
613+
* Tests getTranslatedCalendarConfigJson()
614+
*
615+
* @param array $expectedArray
616+
* @param string $expectedJson
617+
* @dataProvider getTranslatedCalendarConfigJsonDataProvider
618+
* @return void
619+
*/
620+
public function testGetTranslatedCalendarConfigJson(array $expectedArray, string $expectedJson): void
621+
{
622+
$this->encoder->expects($this->once())
623+
->method('encode')
624+
->with($expectedArray)
625+
->willReturn($expectedJson);
626+
627+
$this->assertEquals(
628+
$expectedJson,
629+
$this->_block->getTranslatedCalendarConfigJson()
630+
);
631+
}
632+
633+
/**
634+
* Provider for testGetTranslatedCalendarConfigJson
635+
*
636+
* @return array
637+
*/
638+
public function getTranslatedCalendarConfigJsonDataProvider()
639+
{
640+
return [
641+
[
642+
'expectedArray' => [
643+
'closeText' => 'Done',
644+
'prevText' => 'Prev',
645+
'nextText' => 'Next',
646+
'currentText' => 'Today',
647+
'monthNames' => ['January', 'February', 'March', 'April', 'May', 'June',
648+
'July', 'August', 'September', 'October', 'November', 'December'],
649+
'monthNamesShort' => ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
650+
'dayNames' => ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
651+
'dayNamesShort' => ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
652+
'dayNamesMin' => ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
653+
],
654+
'expectedJson' => '{"closeText":"Done","prevText":"Prev","nextText":"Next","currentText":"Today","monthNames":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthNamesShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"dayNames":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"dayNamesShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"dayNamesMin":["Su","Mo","Tu","We","Th","Fr","Sa"]}'
655+
],
656+
];
657+
}
601658
}

0 commit comments

Comments
 (0)