Skip to content

Commit 01f1cfc

Browse files
committed
MAGETWO-61267: Change format date for update and add ability to run cron from functional test
1 parent 137e78c commit 01f1cfc

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Ui\Test\Unit\Component\Form\Element\DataType;
@@ -12,6 +12,9 @@
1212
use Magento\Framework\Locale\ResolverInterface;
1313
use Magento\Framework\View\Element\UiComponent\Processor;
1414

15+
/**
16+
* Tests Magento\Ui\Test\Unit\Component\Form\Element\DataType Class
17+
*/
1518
class DateTest extends \PHPUnit_Framework_TestCase
1619
{
1720
/** @var \PHPUnit_Framework_MockObject_MockObject */
@@ -42,6 +45,9 @@ public function setUp()
4245
$this->contextMock->expects($this->any())->method('getProcessor')->willReturn($this->processorMock);
4346
}
4447

48+
/**
49+
* This tests ensures that outputDateFormat is properly saved in the configuration with timeOffset.
50+
*/
4551
public function testPrepareWithTimeOffset()
4652
{
4753
$this->date = new Date(
@@ -75,6 +81,9 @@ public function testPrepareWithTimeOffset()
7581
$this->assertEquals($localeDateFormat, $config['outputDateFormat']);
7682
}
7783

84+
/**
85+
* This tests ensures that outputDateFormat is properly saved in the configuration without timeOffset.
86+
*/
7887
public function testPrepareWithoutTimeOffset()
7988
{
8089
$defaultDateFormat = 'MM/dd/y';

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,5 @@
12331233
<field name="url_key" xsi:type="string">simple-product-%isolation%</field>
12341234
<field name="store_code" xsi:type="string">all</field>
12351235
</dataset>
1236-
12371236
</repository>
12381237
</config>

lib/web/moment-timezone-with-data.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)