@@ -68,37 +68,57 @@ describe('validation', () => {
6868 } ) ;
6969
7070 describe ( 'basic' , ( ) => {
71- let validateSpy ;
71+ let validateSpy , changeSpy , input ;
7272
7373 beforeEach ( ( ) => {
7474 timePicker = fixtureSync ( `<vaadin-time-picker></vaadin-time-picker>` ) ;
7575 validateSpy = sinon . spy ( timePicker , 'validate' ) ;
76+ changeSpy = sinon . spy ( ) ;
77+ timePicker . addEventListener ( 'change' , changeSpy ) ;
78+ input = timePicker . inputElement ;
7679 } ) ;
7780
7881 it ( 'should pass validation by default' , ( ) => {
7982 expect ( timePicker . checkValidity ( ) ) . to . be . true ;
8083 expect ( timePicker . validate ( ) ) . to . be . true ;
8184 } ) ;
8285
83- it ( 'should not validate on value input' , ( ) => {
86+ it ( 'should not validate on user input' , ( ) => {
8487 setInputValue ( timePicker , '12:00' ) ;
85- expect ( validateSpy . calledOnce ) . to . be . false ;
88+ expect ( validateSpy . called ) . to . be . false ;
89+ } ) ;
90+
91+ it ( 'should validate on blur' , ( ) => {
92+ input . focus ( ) ;
93+ input . blur ( ) ;
94+ expect ( validateSpy . calledOnce ) . to . be . true ;
8695 } ) ;
8796
88- it ( 'should validate on value commit' , ( ) => {
97+ it ( 'should validate before change event on blur' , ( ) => {
98+ input . focus ( ) ;
8999 setInputValue ( timePicker , '12:00' ) ;
90- enter ( timePicker . inputElement ) ;
100+ input . blur ( ) ;
101+ expect ( changeSpy . calledOnce ) . to . be . true ;
91102 expect ( validateSpy . calledOnce ) . to . be . true ;
103+ expect ( validateSpy . calledBefore ( changeSpy ) ) . to . be . true ;
92104 } ) ;
93105
94- it ( 'should validate on input focusout' , ( ) => {
95- focusout ( timePicker . inputElement ) ;
106+ it ( 'should validate before change event on Enter' , ( ) => {
107+ setInputValue ( timePicker , '12:00' ) ;
108+ enter ( timePicker . inputElement ) ;
109+ expect ( changeSpy . calledOnce ) . to . be . true ;
96110 expect ( validateSpy . calledOnce ) . to . be . true ;
111+ expect ( validateSpy . calledBefore ( changeSpy ) ) . to . be . true ;
97112 } ) ;
98113
99- it ( 'should be possible to force invalid status' , ( ) => {
100- timePicker . invalid = true ;
101- expect ( timePicker . inputElement . hasAttribute ( 'invalid' ) ) . to . be . true ;
114+ it ( 'should validate before change event on clear button click' , ( ) => {
115+ timePicker . clearButtonVisible = true ;
116+ timePicker . value = '12:00' ;
117+ validateSpy . resetHistory ( ) ;
118+ timePicker . $ . clearButton . click ( ) ;
119+ expect ( changeSpy . calledOnce ) . to . be . true ;
120+ expect ( validateSpy . calledOnce ) . to . be . true ;
121+ expect ( validateSpy . calledBefore ( changeSpy ) ) . to . be . true ;
102122 } ) ;
103123
104124 it ( 'should not validate on min change without value' , ( ) => {
0 commit comments