@@ -4,40 +4,38 @@ import { safeSizeTest } from '../../../../helpers/safeSizeTest';
44import { createWidget } from '../../../../helpers/createWidget' ;
55import { getData } from '../../helpers/generateDataSourceData' ;
66import url from '../../../../helpers/getPageUrl' ;
7- import { borderConfigs , rtlAndRowAltConfigs } from '../helpers/testMatrixConfig' ;
7+ import { borderConfigs } from '../helpers/testMatrixConfig' ;
88
99const DATA_GRID_SELECTOR = '#container' ;
1010
1111fixture . disablePageReloads `FixedColumns`
1212 . page ( url ( __dirname , '../../../container.html' ) ) ;
1313
14- borderConfigs . forEach ( ( { showRowLines , showColumnLines, showBorders } ) => {
15- rtlAndRowAltConfigs . forEach ( ( { rtlEnabled, rowAlternationEnabled } ) => {
16- safeSizeTest ( `Band sticky columns: left and right positions (showRowLines = ${ showRowLines } , showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
14+ borderConfigs . forEach ( ( { showColumnLines, showBorders } ) => {
15+ [ true , false ] . forEach ( ( rtlEnabled ) => {
16+ safeSizeTest ( `Band sticky columns: left and right positions (showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
1717 // arrange
1818 const dataGrid = new DataGrid ( DATA_GRID_SELECTOR ) ;
1919 const { takeScreenshot, compareResults } = createScreenshotsComparer ( t ) ;
2020
2121 await t . expect ( dataGrid . isReady ( ) ) . ok ( ) ;
2222
23- await takeScreenshot ( `band-columns-1-(case-1)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
23+ await takeScreenshot ( `band-columns-1-(case-1)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
2424
2525 // act
2626 await dataGrid . scrollTo ( t , { x : rtlEnabled ? 0 : 10000 } ) ;
2727
28- await takeScreenshot ( `band-columns-2-(case-1)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
28+ await takeScreenshot ( `band-columns-2-(case-1)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
2929
3030 await t
3131 . expect ( compareResults . isValid ( ) )
3232 . ok ( compareResults . errorMessages ( ) ) ;
3333 } , [ 1000 , 800 ] ) . before ( async ( ) => createWidget ( 'dxDataGrid' , {
3434 dataSource : getData ( 5 , 25 ) ,
3535 width : 984 ,
36- showRowLines,
3736 showColumnLines,
3837 showBorders,
3938 rtlEnabled,
40- rowAlternationEnabled,
4139 columnAutoWidth : true ,
4240 customizeColumns : ( columns ) => {
4341 columns . push ( {
@@ -76,31 +74,29 @@ borderConfigs.forEach(({ showRowLines, showColumnLines, showBorders }) => {
7674 } ,
7775 } ) ) ;
7876
79- safeSizeTest ( `Band sticky columns: left positions (showRowLines = ${ showRowLines } , showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
77+ safeSizeTest ( `Band sticky columns: left positions (showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
8078 // arrange
8179 const dataGrid = new DataGrid ( DATA_GRID_SELECTOR ) ;
8280 const { takeScreenshot, compareResults } = createScreenshotsComparer ( t ) ;
8381
8482 await t . expect ( dataGrid . isReady ( ) ) . ok ( ) ;
8583
86- await takeScreenshot ( `band-columns-1-(case-2)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
84+ await takeScreenshot ( `band-columns-1-(case-2)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
8785
8886 // act
8987 await dataGrid . scrollTo ( t , { x : rtlEnabled ? 0 : 10000 } ) ;
9088
91- await takeScreenshot ( `band-columns-2-(case-2)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
89+ await takeScreenshot ( `band-columns-2-(case-2)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
9290
9391 await t
9492 . expect ( compareResults . isValid ( ) )
9593 . ok ( compareResults . errorMessages ( ) ) ;
9694 } , [ 1000 , 800 ] ) . before ( async ( ) => createWidget ( 'dxDataGrid' , {
9795 dataSource : getData ( 5 , 25 ) ,
9896 width : 984 ,
99- showRowLines,
10097 showColumnLines,
10198 showBorders,
10299 rtlEnabled,
103- rowAlternationEnabled,
104100 columnAutoWidth : true ,
105101 customizeColumns : ( columns ) => {
106102 columns . push ( {
@@ -139,31 +135,29 @@ borderConfigs.forEach(({ showRowLines, showColumnLines, showBorders }) => {
139135 } ,
140136 } ) ) ;
141137
142- safeSizeTest ( `Band sticky columns: right positions (showRowLines = ${ showRowLines } , showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
138+ safeSizeTest ( `Band sticky columns: right positions (showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
143139 // arrange
144140 const dataGrid = new DataGrid ( DATA_GRID_SELECTOR ) ;
145141 const { takeScreenshot, compareResults } = createScreenshotsComparer ( t ) ;
146142
147143 await t . expect ( dataGrid . isReady ( ) ) . ok ( ) ;
148144
149- await takeScreenshot ( `band-columns-1-(case-3)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
145+ await takeScreenshot ( `band-columns-1-(case-3)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
150146
151147 // act
152148 await dataGrid . scrollTo ( t , { x : rtlEnabled ? 0 : 10000 } ) ;
153149
154- await takeScreenshot ( `band-columns-2-(case-3)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
150+ await takeScreenshot ( `band-columns-2-(case-3)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
155151
156152 await t
157153 . expect ( compareResults . isValid ( ) )
158154 . ok ( compareResults . errorMessages ( ) ) ;
159155 } , [ 1000 , 800 ] ) . before ( async ( ) => createWidget ( 'dxDataGrid' , {
160156 dataSource : getData ( 5 , 25 ) ,
161157 width : 984 ,
162- showRowLines,
163158 showColumnLines,
164159 showBorders,
165160 rtlEnabled,
166- rowAlternationEnabled,
167161 columnAutoWidth : true ,
168162 customizeColumns : ( columns ) => {
169163 columns . push ( {
@@ -202,31 +196,29 @@ borderConfigs.forEach(({ showRowLines, showColumnLines, showBorders }) => {
202196 } ,
203197 } ) ) ;
204198
205- safeSizeTest ( `Band sticky column with left position and unfixed band column (showRowLines = ${ showRowLines } , showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
199+ safeSizeTest ( `Band sticky column with left position and unfixed band column (showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
206200 // arrange
207201 const dataGrid = new DataGrid ( DATA_GRID_SELECTOR ) ;
208202 const { takeScreenshot, compareResults } = createScreenshotsComparer ( t ) ;
209203
210204 await t . expect ( dataGrid . isReady ( ) ) . ok ( ) ;
211205
212- await takeScreenshot ( `band-columns-1-(case-4)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
206+ await takeScreenshot ( `band-columns-1-(case-4)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
213207
214208 // act
215209 await dataGrid . scrollTo ( t , { x : rtlEnabled ? 0 : 10000 } ) ;
216210
217- await takeScreenshot ( `band-columns-2-(case-4)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
211+ await takeScreenshot ( `band-columns-2-(case-4)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
218212
219213 await t
220214 . expect ( compareResults . isValid ( ) )
221215 . ok ( compareResults . errorMessages ( ) ) ;
222216 } , [ 1000 , 800 ] ) . before ( async ( ) => createWidget ( 'dxDataGrid' , {
223217 dataSource : getData ( 5 , 25 ) ,
224218 width : 984 ,
225- showRowLines,
226219 showColumnLines,
227220 showBorders,
228221 rtlEnabled,
229- rowAlternationEnabled,
230222 columnAutoWidth : true ,
231223 customizeColumns : ( columns ) => {
232224 columns . push ( {
@@ -263,31 +255,29 @@ borderConfigs.forEach(({ showRowLines, showColumnLines, showBorders }) => {
263255 } ,
264256 } ) ) ;
265257
266- safeSizeTest ( `Band sticky column with right position and unfixed band column (showRowLines = ${ showRowLines } , showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
258+ safeSizeTest ( `Band sticky column with right position and unfixed band column (showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
267259 // arrange
268260 const dataGrid = new DataGrid ( DATA_GRID_SELECTOR ) ;
269261 const { takeScreenshot, compareResults } = createScreenshotsComparer ( t ) ;
270262
271263 await t . expect ( dataGrid . isReady ( ) ) . ok ( ) ;
272264
273- await takeScreenshot ( `band-columns-1-(case-5)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
265+ await takeScreenshot ( `band-columns-1-(case-5)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
274266
275267 // act
276268 await dataGrid . scrollTo ( t , { x : rtlEnabled ? 0 : 10000 } ) ;
277269
278- await takeScreenshot ( `band-columns-2-(case-5)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
270+ await takeScreenshot ( `band-columns-2-(case-5)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
279271
280272 await t
281273 . expect ( compareResults . isValid ( ) )
282274 . ok ( compareResults . errorMessages ( ) ) ;
283275 } , [ 1000 , 800 ] ) . before ( async ( ) => createWidget ( 'dxDataGrid' , {
284276 dataSource : getData ( 5 , 25 ) ,
285277 width : 984 ,
286- showRowLines,
287278 showColumnLines,
288279 showBorders,
289280 rtlEnabled,
290- rowAlternationEnabled,
291281 columnAutoWidth : true ,
292282 customizeColumns : ( columns ) => {
293283 columns . push ( {
@@ -324,31 +314,29 @@ borderConfigs.forEach(({ showRowLines, showColumnLines, showBorders }) => {
324314 } ,
325315 } ) ) ;
326316
327- safeSizeTest ( `Adjacent band sticky columns: sticky positions (showRowLines = ${ showRowLines } , showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
317+ safeSizeTest ( `Adjacent band sticky columns: sticky positions (showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
328318 // arrange
329319 const dataGrid = new DataGrid ( DATA_GRID_SELECTOR ) ;
330320 const { takeScreenshot, compareResults } = createScreenshotsComparer ( t ) ;
331321
332322 await t . expect ( dataGrid . isReady ( ) ) . ok ( ) ;
333323
334- await takeScreenshot ( `band-columns-1-(case-6)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
324+ await takeScreenshot ( `band-columns-1-(case-6)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
335325
336326 // act
337327 await dataGrid . scrollTo ( t , { x : rtlEnabled ? 0 : 10000 } ) ;
338328
339- await takeScreenshot ( `band-columns-2-(case-6)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
329+ await takeScreenshot ( `band-columns-2-(case-6)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
340330
341331 await t
342332 . expect ( compareResults . isValid ( ) )
343333 . ok ( compareResults . errorMessages ( ) ) ;
344334 } , [ 1000 , 800 ] ) . before ( async ( ) => createWidget ( 'dxDataGrid' , {
345335 dataSource : getData ( 5 , 25 ) ,
346336 width : 984 ,
347- showRowLines,
348337 showColumnLines,
349338 showBorders,
350339 rtlEnabled,
351- rowAlternationEnabled,
352340 columnAutoWidth : true ,
353341 customizeColumns : ( columns ) => {
354342 columns . splice ( 2 , 0 , {
@@ -388,31 +376,29 @@ borderConfigs.forEach(({ showRowLines, showColumnLines, showBorders }) => {
388376 } ,
389377 } ) ) ;
390378
391- safeSizeTest ( `First and last band sticky columns: sticky positions (showRowLines = ${ showRowLines } , showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
379+ safeSizeTest ( `First and last band sticky columns: sticky positions (showColumnLines = ${ showColumnLines } , showBorders = ${ showBorders } )` , async ( t ) => {
392380 // arrange
393381 const dataGrid = new DataGrid ( DATA_GRID_SELECTOR ) ;
394382 const { takeScreenshot, compareResults } = createScreenshotsComparer ( t ) ;
395383
396384 await t . expect ( dataGrid . isReady ( ) ) . ok ( ) ;
397385
398- await takeScreenshot ( `band-columns-1-(case-7)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
386+ await takeScreenshot ( `band-columns-1-(case-7)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
399387
400388 // act
401389 await dataGrid . scrollTo ( t , { x : rtlEnabled ? 0 : 10000 } ) ;
402390
403- await takeScreenshot ( `band-columns-2-(case-7)(rLines_ =_${ showRowLines } _cLines_=_ ${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } _rAlt_=_ ${ rowAlternationEnabled } ).png` , dataGrid . element ) ;
391+ await takeScreenshot ( `band-columns-2-(case-7)(cLines_ =_${ showColumnLines } _borders_=_${ showBorders } _rtl_=_${ rtlEnabled } ).png` , dataGrid . element ) ;
404392
405393 await t
406394 . expect ( compareResults . isValid ( ) )
407395 . ok ( compareResults . errorMessages ( ) ) ;
408396 } , [ 1000 , 800 ] ) . before ( async ( ) => createWidget ( 'dxDataGrid' , {
409397 dataSource : getData ( 5 , 25 ) ,
410398 width : 984 ,
411- showRowLines,
412399 showColumnLines,
413400 showBorders,
414401 rtlEnabled,
415- rowAlternationEnabled,
416402 columnAutoWidth : true ,
417403 customizeColumns : ( columns ) => {
418404 columns . unshift ( {
0 commit comments