@@ -5559,12 +5559,9 @@ QUnit.module('Global formatting config (spec)', baseModuleConfig, () => {
55595559 dateFormat : 'dd/MM/yyyy' ,
55605560 } ) ;
55615561
5562- const dataGrid = createDataGrid ( {
5563- dataSource : [ { createdAt : new Date ( 2020 , 0 , 2 ) } ] ,
5564- columns : [ { dataField : 'createdAt' , dataType : 'date' } ] ,
5565- } ) ;
5562+ const format = gridCore . getFormatByDataType ( 'date' ) ;
5563+ const dateText = gridCore . formatValue ( new Date ( 2020 , 0 , 2 ) , { format } ) ;
55665564
5567- const dateText = $ ( dataGrid . getCellElement ( 0 , 0 ) ) . text ( ) . trim ( ) ;
55685565 assert . strictEqual ( dateText , '02/01/2020' , 'global date format is applied for implicit DataGrid date format' ) ;
55695566 } finally {
55705567 restoreGlobalFormats ( saved ) ;
@@ -5580,12 +5577,9 @@ QUnit.module('Global formatting config (spec)', baseModuleConfig, () => {
55805577 dateTimeFormat : 'dd/MM/yyyy, HH:mm' ,
55815578 } ) ;
55825579
5583- const dataGrid = createDataGrid ( {
5584- dataSource : [ { createdAt : new Date ( 2020 , 0 , 2 , 14 , 5 ) } ] ,
5585- columns : [ { dataField : 'createdAt' , dataType : 'datetime' } ] ,
5586- } ) ;
5580+ const format = gridCore . getFormatByDataType ( 'datetime' ) ;
5581+ const dateText = gridCore . formatValue ( new Date ( 2020 , 0 , 2 , 14 , 5 ) , { format } ) ;
55875582
5588- const dateText = $ ( dataGrid . getCellElement ( 0 , 0 ) ) . text ( ) . trim ( ) ;
55895583 assert . strictEqual ( dateText , '02/01/2020, 14:05' , 'global datetime format is applied for implicit DataGrid datetime format' ) ;
55905584 } finally {
55915585 restoreGlobalFormats ( saved ) ;
@@ -5605,6 +5599,7 @@ QUnit.module('Global formatting config (spec)', baseModuleConfig, () => {
56055599 dataSource : [ { createdAt : new Date ( 2020 , 0 , 2 ) } ] ,
56065600 columns : [ { dataField : 'createdAt' , dataType : 'date' , format : 'shortDate' } ] ,
56075601 } ) ;
5602+ this . clock . tick ( 10 ) ;
56085603
56095604 const dateText = $ ( dataGrid . getCellElement ( 0 , 0 ) ) . text ( ) . trim ( ) ;
56105605 assert . strictEqual ( dateText , '1/2/2020' , 'explicit preset format is not replaced by global dateFormat' ) ;
0 commit comments