@@ -567,15 +567,15 @@ describe('IgxSlider', () => {
567567 fixture . detectChanges ( ) ;
568568
569569 expect ( sliderEl ) . toBeDefined ( ) ;
570- let activeThumb = sliderEl . query ( By . css ( '.igx-slider__thumb -to--active' ) ) ;
571- expect ( activeThumb ) . not . toBeNull ( ) ;
570+ let activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -to--active' ) ) ;
571+ expect ( activeLabel ) . not . toBeNull ( ) ;
572572
573573 sliderEl . nativeElement . dispatchEvent ( new PointerEvent ( 'pointerup' , { pointerId : 1 } ) ) ;
574574 await wait ( slider . thumbLabelVisibilityDuration + 10 ) ;
575575 fixture . detectChanges ( ) ;
576576
577- activeThumb = fixture . debugElement . query ( By . css ( '.igx-slider__thumb -to--active' ) ) ;
578- expect ( activeThumb ) . toBeNull ( ) ;
577+ activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -to--active' ) ) ;
578+ expect ( activeLabel ) . toBeNull ( ) ;
579579 } ) ;
580580
581581 it ( 'should be able to change thumbLabelVisibilityDuration' , async ( ) => {
@@ -586,20 +586,20 @@ describe('IgxSlider', () => {
586586 fixture . detectChanges ( ) ;
587587
588588 expect ( sliderEl ) . toBeDefined ( ) ;
589- let activeThumb = sliderEl . query ( By . css ( '.igx-slider__thumb -to--active' ) ) ;
590- expect ( activeThumb ) . not . toBeNull ( ) ;
589+ let activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -to--active' ) ) ;
590+ expect ( activeLabel ) . not . toBeNull ( ) ;
591591
592592 sliderEl . nativeElement . dispatchEvent ( new PointerEvent ( 'pointerup' , { pointerId : 1 } ) ) ;
593593 await wait ( 750 ) ;
594594 fixture . detectChanges ( ) ;
595595
596- activeThumb = sliderEl . query ( By . css ( '.igx-slider__thumb -to--active' ) ) ;
597- expect ( activeThumb ) . not . toBeNull ( ) ;
596+ activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -to--active' ) ) ;
597+ expect ( activeLabel ) . not . toBeNull ( ) ;
598598
599599 await wait ( 300 ) ;
600600 fixture . detectChanges ( ) ;
601- activeThumb = sliderEl . query ( By . css ( '.igx-slider__thumb -to--active' ) ) ;
602- expect ( activeThumb ) . toBeNull ( ) ;
601+ activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -to--active' ) ) ;
602+ expect ( activeLabel ) . toBeNull ( ) ;
603603 } ) ;
604604
605605 it ( 'rendering of the slider should corresponds to the set labels' , ( ) => {
@@ -838,15 +838,15 @@ describe('IgxSlider', () => {
838838 fixture . detectChanges ( ) ;
839839
840840 expect ( sliderEl ) . toBeDefined ( ) ;
841- let activeThumb = fixture . debugElement . query ( By . css ( '.igx-slider__thumb -from--active' ) ) ;
842- expect ( activeThumb ) . not . toBeNull ( ) ;
841+ let activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -from--active' ) ) ;
842+ expect ( activeLabel ) . not . toBeNull ( ) ;
843843
844844 sliderEl . dispatchEvent ( new PointerEvent ( 'pointerup' , { pointerId : 1 } ) ) ;
845845 await wait ( slider . thumbLabelVisibilityDuration + 10 ) ;
846846 fixture . detectChanges ( ) ;
847847
848- activeThumb = fixture . debugElement . query ( By . css ( '.igx-slider__thumb -from--active' ) ) ;
849- expect ( activeThumb ) . toBeNull ( ) ;
848+ activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -from--active' ) ) ;
849+ expect ( activeLabel ) . toBeNull ( ) ;
850850 } ) ;
851851
852852 it ( 'should be able to change thumbLabelVisibilityDuration' , async ( ) => {
@@ -857,20 +857,20 @@ describe('IgxSlider', () => {
857857 fixture . detectChanges ( ) ;
858858
859859 expect ( sliderEl ) . toBeDefined ( ) ;
860- let activeThumb = fixture . debugElement . query ( By . css ( '.igx-slider__thumb -from--active' ) ) ;
861- expect ( activeThumb ) . not . toBeNull ( ) ;
860+ let activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -from--active' ) ) ;
861+ expect ( activeLabel ) . not . toBeNull ( ) ;
862862
863863 sliderEl . dispatchEvent ( new PointerEvent ( 'pointerup' , { pointerId : 1 } ) ) ;
864864 await wait ( 750 ) ;
865865 fixture . detectChanges ( ) ;
866866
867- activeThumb = fixture . debugElement . query ( By . css ( '.igx-slider__thumb -from--active' ) ) ;
868- expect ( activeThumb ) . not . toBeNull ( ) ;
867+ activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -from--active' ) ) ;
868+ expect ( activeLabel ) . not . toBeNull ( ) ;
869869
870870 await wait ( 300 ) ;
871871 fixture . detectChanges ( ) ;
872- activeThumb = fixture . debugElement . query ( By . css ( '.igx-slider__thumb -from--active' ) ) ;
873- expect ( activeThumb ) . toBeNull ( ) ;
872+ activeLabel = fixture . debugElement . query ( By . css ( '.igx-slider__label -from--active' ) ) ;
873+ expect ( activeLabel ) . toBeNull ( ) ;
874874 } ) ;
875875
876876 it ( 'rendering of the slider should corresponds to the set labels' , ( ) => {
@@ -884,32 +884,32 @@ describe('IgxSlider', () => {
884884
885885 UIInteractions . triggerKeyDownEvtUponElem ( 'ArrowRight' , fromThumb . nativeElement , true ) ;
886886 fixture . detectChanges ( ) ;
887- expect ( fixture . componentInstance . label ) . toEqual ( { lower : 1 , upper : 6 } ) ;
887+ expect ( fixture . componentInstance . slider . value ) . toEqual ( { lower : 1 , upper : 6 } ) ;
888888 expect ( slider . lowerLabel ) . toEqual ( 'Tuesday' ) ;
889889
890890 UIInteractions . triggerKeyDownEvtUponElem ( 'ArrowRight' , fromThumb . nativeElement , true ) ;
891891 fixture . detectChanges ( ) ;
892- expect ( fixture . componentInstance . label ) . toEqual ( { lower : 2 , upper : 6 } ) ;
892+ expect ( fixture . componentInstance . slider . value ) . toEqual ( { lower : 2 , upper : 6 } ) ;
893893 expect ( slider . lowerLabel ) . toEqual ( 'Wednesday' ) ;
894894
895895 UIInteractions . triggerKeyDownEvtUponElem ( 'ArrowRight' , fromThumb . nativeElement , true ) ;
896896 fixture . detectChanges ( ) ;
897- expect ( fixture . componentInstance . label ) . toEqual ( { lower : 3 , upper : 6 } ) ;
897+ expect ( fixture . componentInstance . slider . value ) . toEqual ( { lower : 3 , upper : 6 } ) ;
898898 expect ( slider . lowerLabel ) . toEqual ( 'Thursday' ) ;
899899
900900 UIInteractions . triggerKeyDownEvtUponElem ( 'ArrowRight' , fromThumb . nativeElement , true ) ;
901901 fixture . detectChanges ( ) ;
902- expect ( fixture . componentInstance . label ) . toEqual ( { lower : 4 , upper : 6 } ) ;
902+ expect ( fixture . componentInstance . slider . value ) . toEqual ( { lower : 4 , upper : 6 } ) ;
903903 expect ( slider . lowerLabel ) . toEqual ( 'Friday' ) ;
904904
905905 UIInteractions . triggerKeyDownEvtUponElem ( 'ArrowLeft' , toThumb . nativeElement , true ) ;
906906 fixture . detectChanges ( ) ;
907- expect ( fixture . componentInstance . label ) . toEqual ( { lower : 4 , upper : 5 } ) ;
907+ expect ( fixture . componentInstance . slider . value ) . toEqual ( { lower : 4 , upper : 5 } ) ;
908908 expect ( slider . upperLabel ) . toEqual ( 'Saturday' ) ;
909909
910910 UIInteractions . triggerKeyDownEvtUponElem ( 'ArrowLeft' , toThumb . nativeElement , true ) ;
911911 fixture . detectChanges ( ) ;
912- expect ( fixture . componentInstance . label ) . toEqual ( { lower : 4 , upper : 4 } ) ;
912+ expect ( fixture . componentInstance . slider . value ) . toEqual ( { lower : 4 , upper : 4 } ) ;
913913 expect ( slider . upperLabel ) . toEqual ( 'Friday' ) ;
914914 } ) ;
915915
@@ -1686,19 +1686,21 @@ class SliderWithLabelsComponent {
16861686
16871687@Component ( {
16881688 template : `
1689- <igx-slider [(ngModel)]='label' [type]="type"
1690- [labels]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']">
1689+ <igx-slider
1690+ [labels]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']"
1691+ [type]="type">
16911692 </igx-slider> `
16921693} )
16931694class RangeSliderWithLabelsComponent {
1694- @ViewChild ( IgxSliderComponent , { read : IgxSliderComponent , static : true } ) public slider : IgxSliderComponent ;
1695- public label ;
1695+ @ViewChild ( IgxSliderComponent , { read : IgxSliderComponent , static : true } )
1696+ public slider : IgxSliderComponent ;
1697+
16961698 public type = IgxSliderType . RANGE ;
16971699}
16981700
16991701@Component ( {
17001702 template : `
1701- <igx-slider [(ngModel)]='label' [ type]="type"
1703+ <igx-slider [type]="type"
17021704 [labels]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']">
17031705 <ng-template igxSliderThumbFrom let-value let-labels="labels">
17041706 <span class="custom"> Lower {{ labels[value.lower] }}</span>
0 commit comments