Skip to content

Commit 212c693

Browse files
ChronosSFChronosSF
committed
fix(tests): adding normalize to certain date formatting tests
1 parent b8dd705 commit 212c693

File tree

4 files changed

+32
-31
lines changed

4 files changed

+32
-31
lines changed

‎projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ describe('IgxGrid - Cell component #grid', () => {
393393
const grid = fixture.componentInstance.grid;
394394
const receiveTime = grid.getColumnByName('ReceiveTime');
395395

396-
expect(receiveTime._cells[0].title).toEqual('8:37:11 AM');
397-
expect(receiveTime._cells[5].title).toEqual('12:47:42 PM');
396+
expect(receiveTime._cells[0].title.normalize("NFKD")).toEqual('8:37:11 AM');
397+
expect(receiveTime._cells[5].title.normalize("NFKD")).toEqual('12:47:42 PM');
398398

399399
const product = grid.getColumnByName('ProductName');
400400

‎projects/igniteui-angular/src/lib/grids/grid/column.spec.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -858,9 +858,9 @@ describe('IgxGrid - Column properties #grid', () => {
858858
it('should display correctly the data when column dataType is dateTime #ivy', () => {
859859
let orderDateColumn = grid.getColumnByName('OrderDate');
860860

861-
expect(orderDateColumn._cells[0].nativeElement.innerText).toEqual('Oct 1, 2015, 11:37:22 AM');
862-
expect(orderDateColumn._cells[5].nativeElement.innerText).toEqual('Oct 30, 2019, 4:17:27 PM');
863-
expect(orderDateColumn._cells[8].nativeElement.innerText).toEqual('Aug 3, 2021, 3:15:00 PM');
861+
expect(orderDateColumn._cells[0].nativeElement.innerText.normalize("NFKD")).toEqual('Oct 1, 2015, 11:37:22 AM');
862+
expect(orderDateColumn._cells[5].nativeElement.innerText.normalize("NFKD")).toEqual('Oct 30, 2019, 4:17:27 PM');
863+
expect(orderDateColumn._cells[8].nativeElement.innerText.normalize("NFKD")).toEqual('Aug 3, 2021, 3:15:00 PM');
864864

865865
orderDateColumn.pipeArgs = { format: 'short' };
866866
fix.detectChanges();
@@ -872,16 +872,16 @@ describe('IgxGrid - Column properties #grid', () => {
872872
fix.detectChanges();
873873

874874
orderDateColumn = grid.getColumnByName('OrderDate');
875-
expect(orderDateColumn._cells[0].nativeElement.innerText).toEqual('10/1/15, 11:37 AM');
876-
expect(orderDateColumn._cells[5].nativeElement.innerText).toEqual('10/30/19, 4:17 PM');
877-
expect(orderDateColumn._cells[8].nativeElement.innerText).toEqual('8/3/21, 3:15 PM');
875+
expect(orderDateColumn._cells[0].nativeElement.innerText.normalize("NFKD")).toEqual('10/1/15, 11:37 AM');
876+
expect(orderDateColumn._cells[5].nativeElement.innerText.normalize("NFKD")).toEqual('10/30/19, 4:17 PM');
877+
expect(orderDateColumn._cells[8].nativeElement.innerText.normalize("NFKD")).toEqual('8/3/21, 3:15 PM');
878878
});
879879

880880
it('should display correctly the data when column dataType is time #ivy', () => {
881881
let receiveTime = grid.getColumnByName('ReceiveTime');
882882

883-
expect(receiveTime._cells[0].nativeElement.innerText).toEqual('8:37:11 AM');
884-
expect(receiveTime._cells[5].nativeElement.innerText).toEqual('12:47:42 PM');
883+
expect(receiveTime._cells[0].nativeElement.innerText.normalize("NFKD")).toEqual('8:37:11 AM');
884+
expect(receiveTime._cells[5].nativeElement.innerText.normalize("NFKD")).toEqual('12:47:42 PM');
885885

886886
receiveTime.pipeArgs = { format: 'shortTime' };
887887
fix.detectChanges();
@@ -893,8 +893,8 @@ describe('IgxGrid - Column properties #grid', () => {
893893
fix.detectChanges();
894894

895895
receiveTime = grid.getColumnByName('ReceiveTime');
896-
expect(receiveTime._cells[0].nativeElement.innerText).toEqual('8:37 AM');
897-
expect(receiveTime._cells[5].nativeElement.innerText).toEqual('12:47 PM');
896+
expect(receiveTime._cells[0].nativeElement.innerText.normalize("NFKD")).toEqual('8:37 AM');
897+
expect(receiveTime._cells[5].nativeElement.innerText.normalize("NFKD")).toEqual('12:47 PM');
898898
});
899899

900900
it('DateTime: should preview the dateTime value correctly when cell is in edit mode correctly', fakeAsync(() => {
@@ -903,7 +903,7 @@ describe('IgxGrid - Column properties #grid', () => {
903903
fix.detectChanges();
904904

905905
const firstCell = orderColumn._cells[0];
906-
expect(firstCell.nativeElement.innerText).toEqual('Oct 1, 2015, 11:37:22 AM');
906+
expect(firstCell.nativeElement.innerText.normalize("NFKD")).toEqual('Oct 1, 2015, 11:37:22 AM');
907907

908908
firstCell.setEditMode(true);
909909
fix.detectChanges();
@@ -933,7 +933,7 @@ describe('IgxGrid - Column properties #grid', () => {
933933
grid.endEdit(true);
934934
fix.detectChanges();
935935

936-
expect(firstCell.nativeElement.innerText).toEqual('Dec 3, 2021, 3:15:22 PM');
936+
expect(firstCell.nativeElement.innerText.normalize("NFKD")).toEqual('Dec 3, 2021, 3:15:22 PM');
937937
}));
938938

939939
it('Time: should preview the time value correctly when cell is in edit mode correctly', fakeAsync(() => {
@@ -943,7 +943,7 @@ describe('IgxGrid - Column properties #grid', () => {
943943

944944
const cell = timeColumn._cells[1];
945945

946-
expect(cell.nativeElement.innerText).toEqual('12:12:02 PM');
946+
expect(cell.nativeElement.innerText.normalize("NFKD")).toEqual('12:12:02 PM');
947947

948948
cell.setEditMode(true);
949949
tick();
@@ -964,7 +964,7 @@ describe('IgxGrid - Column properties #grid', () => {
964964
grid.endEdit(true);
965965
fix.detectChanges();
966966

967-
expect(cell.nativeElement.innerText).toEqual('10:12:02 AM');
967+
expect(cell.nativeElement.innerText.normalize("NFKD")).toEqual('10:12:02 AM');
968968
}));
969969

970970
it('should display summaries correctly for dateTime and time column', () => {
@@ -1006,8 +1006,8 @@ describe('IgxGrid - Column properties #grid', () => {
10061006
let esfSearch = GridFunctions.getExcelFilteringSearchComponent(fix, excelMenu);
10071007
let checkBoxes = esfSearch.querySelectorAll('igx-checkbox');
10081008

1009-
expect((checkBoxes[1].querySelector('.igx-checkbox__label') as HTMLElement).innerText).toEqual('Mar 12, 2015, 9:31:22 PM');
1010-
expect((checkBoxes[3].querySelector('.igx-checkbox__label') as HTMLElement).innerText).toEqual('Aug 18, 2016, 11:17:22 AM');
1009+
expect((checkBoxes[1].querySelector('.igx-checkbox__label') as HTMLElement).innerText.normalize("NFKD")).toEqual('Mar 12, 2015, 9:31:22 PM');
1010+
expect((checkBoxes[3].querySelector('.igx-checkbox__label') as HTMLElement).innerText.normalize("NFKD")).toEqual('Aug 18, 2016, 11:17:22 AM');
10111011

10121012
GridFunctions.clickCancelExcelStyleFiltering(fix);
10131013
fix.detectChanges();
@@ -1025,8 +1025,8 @@ describe('IgxGrid - Column properties #grid', () => {
10251025
esfSearch = GridFunctions.getExcelFilteringSearchComponent(fix, excelMenu);
10261026
checkBoxes = esfSearch.querySelectorAll('igx-checkbox');
10271027

1028-
expect((checkBoxes[1].querySelector('.igx-checkbox__label') as HTMLElement).innerText).toEqual('3/12/15, 9:31 PM');
1029-
expect((checkBoxes[3].querySelector('.igx-checkbox__label') as HTMLElement).innerText).toEqual('8/18/16, 11:17 AM');
1028+
expect((checkBoxes[1].querySelector('.igx-checkbox__label') as HTMLElement).innerText.normalize("NFKD")).toEqual('3/12/15, 9:31 PM');
1029+
expect((checkBoxes[3].querySelector('.igx-checkbox__label') as HTMLElement).innerText.normalize("NFKD")).toEqual('8/18/16, 11:17 AM');
10301030
}));
10311031

10321032
it('Time: filtering UI list should be populated with correct values based on the pipeArgs', fakeAsync(() => {
@@ -1044,8 +1044,8 @@ describe('IgxGrid - Column properties #grid', () => {
10441044
let esfSearch = GridFunctions.getExcelFilteringSearchComponent(fix, excelMenu);
10451045
let checkBoxes = esfSearch.querySelectorAll('igx-checkbox');
10461046

1047-
expect((checkBoxes[1].querySelector('.igx-checkbox__label') as HTMLElement).innerText).toEqual('6:40:18 AM');
1048-
expect((checkBoxes[3].querySelector('.igx-checkbox__label') as HTMLElement).innerText).toEqual('12:12:02 PM');
1047+
expect((checkBoxes[1].querySelector('.igx-checkbox__label') as HTMLElement).innerText.normalize("NFKD")).toEqual('6:40:18 AM');
1048+
expect((checkBoxes[3].querySelector('.igx-checkbox__label') as HTMLElement).innerText.normalize("NFKD")).toEqual('12:12:02 PM');
10491049
GridFunctions.clickCancelExcelStyleFiltering(fix);
10501050
tick(200);
10511051
fix.detectChanges();
@@ -1061,8 +1061,8 @@ describe('IgxGrid - Column properties #grid', () => {
10611061
esfSearch = GridFunctions.getExcelFilteringSearchComponent(fix, excelMenu);
10621062
checkBoxes = esfSearch.querySelectorAll('igx-checkbox');
10631063

1064-
expect((checkBoxes[1].querySelector('.igx-checkbox__label') as HTMLElement).innerText).toEqual('6:40 AM');
1065-
expect((checkBoxes[3].querySelector('.igx-checkbox__label') as HTMLElement).innerText).toEqual('12:12 PM');
1064+
expect((checkBoxes[1].querySelector('.igx-checkbox__label') as HTMLElement).innerText.normalize("NFKD")).toEqual('6:40 AM');
1065+
expect((checkBoxes[3].querySelector('.igx-checkbox__label') as HTMLElement).innerText.normalize("NFKD")).toEqual('12:12 PM');
10661066
}));
10671067

10681068
it('DateTime: dateTime input should be disabled when try to filter based on unary conditions - today or etc. #ivy', fakeAsync(() => {
@@ -1135,12 +1135,12 @@ describe('IgxGrid - Column properties #grid', () => {
11351135
it('DateTime: Use pipeArgs.format as inputFormat for cell editor if numeric and editorOptions.dateTimeFormat is unset', fakeAsync(() => {
11361136
const orderDateColumn = grid.getColumnByName('OrderDate');
11371137
const firstCell = orderDateColumn._cells[0];
1138-
expect(firstCell.nativeElement.innerText).toEqual('Oct 1, 2015, 11:37:22 AM');
1138+
expect(firstCell.nativeElement.innerText.normalize('NFKD')).toEqual('Oct 1, 2015, 11:37:22 AM');
11391139

11401140
orderDateColumn.pipeArgs = { format: 'dd-MM-yyyy hh:mm aa' };
11411141
fix.detectChanges();
11421142

1143-
expect(firstCell.nativeElement.innerText).toEqual('01-10-2015 11:37 AM');
1143+
expect(firstCell.nativeElement.innerText.normalize('NFKD')).toEqual('01-10-2015 11:37 AM');
11441144

11451145
firstCell.setEditMode(true);
11461146
fix.detectChanges();
@@ -1220,12 +1220,12 @@ describe('IgxGrid - Column properties #grid', () => {
12201220
it('Time: Use pipeArgs.format as inputFormat for cell editor if numeric and editorOptions.dateTimeFormat is unset', fakeAsync(() => {
12211221
const receivedTimeColumn = grid.getColumnByName('ReceiveTime');
12221222
const firstCell = receivedTimeColumn._cells[0];
1223-
expect(firstCell.nativeElement.innerText).toEqual('8:37:11 AM');
1223+
expect(firstCell.nativeElement.innerText.normalize('NFKD')).toEqual('8:37:11 AM');
12241224

12251225
receivedTimeColumn.pipeArgs = { format: 'h-mm-ss aaaaa' };
12261226
fix.detectChanges();
12271227

1228-
expect(firstCell.nativeElement.innerText).toEqual('8-37-11 a');
1228+
expect(firstCell.nativeElement.innerText.normalize('NFKD')).toEqual('8-37-11 a');
12291229

12301230
firstCell.setEditMode(true);
12311231
fix.detectChanges();
@@ -1243,7 +1243,7 @@ describe('IgxGrid - Column properties #grid', () => {
12431243
firstCell.setEditMode(false);
12441244
fix.detectChanges();
12451245

1246-
expect(firstCell.nativeElement.innerText).toContain('8:37:11 AM GMT');
1246+
expect(firstCell.nativeElement.innerText.normalize('NFKD')).toContain('8:37:11 AM GMT');
12471247

12481248
firstCell.setEditMode(true);
12491249
fix.detectChanges();

‎projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7439,7 +7439,7 @@ const verifyExcelStyleFilterAvailableOptions = (fix, labels: string[], checked:
74397439

74407440
expect(labelElements.length).toBe(labels.length, 'incorrect rendered list items count');
74417441
labels.forEach((l, index) => {
7442-
expect(l).toEqual(labelElements[index].innerText);
7442+
expect(l).toEqual(labelElements[index].innerText.normalize("NFKD"));
74437443
});
74447444
checked.forEach((c, index) => {
74457445
expect(checkboxElements[index].indeterminate ? null : checkboxElements[index].checked).toEqual(c);

‎projects/igniteui-angular/src/lib/test-utils/grid-functions.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,8 @@ export class GridSummaryFunctions {
17841784
expect(summaryLabels[i]).toEqual(summaryLabel.nativeElement.textContent.trim());
17851785
if (summaryResults.length > 0) {
17861786
const summaryResult = summaryItem.query(By.css('.igx-grid-summary__result'));
1787-
expect(summaryResults[i]).toEqual(summaryResult.nativeElement.textContent.trim());
1787+
expect(summaryResults[i].normalize("NFKD"))
1788+
.toEqual(summaryResult.nativeElement.textContent.trim().normalize("NFKD"));
17881789
}
17891790
}
17901791
}

0 commit comments

Comments
 (0)