diff --git a/src/app/modules/angular-slickgrid/components/__tests__/slick-pagination-without-translate.component.spec.ts b/src/app/modules/angular-slickgrid/components/__tests__/slick-pagination-without-translate.component.spec.ts index afdd931b7..fe2c7de14 100644 --- a/src/app/modules/angular-slickgrid/components/__tests__/slick-pagination-without-translate.component.spec.ts +++ b/src/app/modules/angular-slickgrid/components/__tests__/slick-pagination-without-translate.component.spec.ts @@ -140,10 +140,12 @@ describe('without ngx-translate', () => { setTimeout(() => { fixture.detectChanges(); const elm = document.querySelector('.slick-pagination'); - const pageInfo = fixture.debugElement.query(By.css('.slick-pagination-count')).nativeElement; + const pageInfoFromTo = fixture.debugElement.query(By.css('.page-info-from-to')).nativeElement; + const pageInfoTotalItems = fixture.debugElement.query(By.css('.page-info-total-items')).nativeElement; expect(elm.innerHTML).toContain('slick-pagination-nav'); - expect(pageInfo.innerHTML).toBe('5-10 of 100 items'); + expect(pageInfoFromTo.innerHTML).toBe('5-10 of '); + expect(pageInfoTotalItems.innerHTML).toBe('100 items '); done(); }, 10); }); diff --git a/src/app/modules/angular-slickgrid/components/__tests__/slick-pagination.component.spec.ts b/src/app/modules/angular-slickgrid/components/__tests__/slick-pagination.component.spec.ts index d9bd061c7..e87fd6103 100644 --- a/src/app/modules/angular-slickgrid/components/__tests__/slick-pagination.component.spec.ts +++ b/src/app/modules/angular-slickgrid/components/__tests__/slick-pagination.component.spec.ts @@ -147,10 +147,27 @@ describe('App Component', () => { fixture.detectChanges(); const elm = document.querySelector('.slick-pagination'); - const pageInfo = fixture.debugElement.query(By.css('.slick-pagination-count')).nativeElement; + const pageInfoFromTo = fixture.debugElement.query(By.css('.page-info-from-to')).nativeElement; + const pageInfoTotalItems = fixture.debugElement.query(By.css('.page-info-total-items')).nativeElement; expect(elm.innerHTML).toContain('slick-pagination-nav'); - expect(pageInfo.innerHTML).toBe('5-10 de 100 éléments'); + expect(pageInfoFromTo.innerHTML).toBe('5-10 de '); + expect(pageInfoTotalItems.innerHTML).toBe('100 éléments '); + expect(component.totalItems).toBe(100); + }); + + it('should create a the Slick-Pagination component in the DOM and expect different locale when changed', () => { + translate.use('en'); + fixture.detectChanges(); + + const elm = document.querySelector('.slick-pagination'); + const pageInfoFromTo = fixture.debugElement.query(By.css('.page-info-from-to')).nativeElement; + const pageInfoTotalItems = fixture.debugElement.query(By.css('.page-info-total-items')).nativeElement; + + expect(translate.currentLang).toBe('en'); + expect(elm.innerHTML).toContain('slick-pagination-nav'); + expect(pageInfoFromTo.innerHTML).toBe('5-10 of '); + expect(pageInfoTotalItems.innerHTML).toBe('100 items '); expect(component.totalItems).toBe(100); }); diff --git a/src/app/modules/angular-slickgrid/components/slick-pagination.component.html b/src/app/modules/angular-slickgrid/components/slick-pagination.component.html index 5fabeb440..d4762b2f7 100644 --- a/src/app/modules/angular-slickgrid/components/slick-pagination.component.html +++ b/src/app/modules/angular-slickgrid/components/slick-pagination.component.html @@ -4,12 +4,12 @@ @@ -17,23 +17,23 @@
{{textPage}} - - {{textOf}} {{pager?.pageCount}} + + {{textOf}} {{pager?.pageCount}}