@@ -1760,7 +1760,6 @@ describe('DatePicker', () => {
17601760 picker . $el . querySelector ( 'td.available ~ td.available' ) . click ( ) ;
17611761 setTimeout ( _ => {
17621762 expect ( spy . calledOnce ) . to . equal ( true ) ;
1763- console . log ( 'first assert passed' ) ;
17641763 // change event is not emitted if used does not change value
17651764 // datarange also requires proper array equality check
17661765 input . blur ( ) ;
@@ -1773,7 +1772,6 @@ describe('DatePicker', () => {
17731772 endCell . click ( ) ;
17741773 setTimeout ( _ => {
17751774 expect ( spy . calledOnce ) . to . equal ( true ) ;
1776- console . log ( 'second assert passed' ) ;
17771775 done ( ) ;
17781776 } , DELAY ) ;
17791777 } , DELAY ) ;
@@ -2194,6 +2192,43 @@ describe('DatePicker', () => {
21942192 } , DELAY ) ;
21952193 } , DELAY ) ;
21962194 } ) ;
2195+
2196+ it ( 'confirm honors disabledDate' , done => {
2197+ vm = createVue ( {
2198+ template : '<el-date-picker type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" v-model="value" :picker-options="pickerOptions" ref="compo" />' ,
2199+ data ( ) {
2200+ return {
2201+ pickerOptions : {
2202+ disabledDate ( date ) {
2203+ return date . getTime ( ) < new Date ( 2000 , 9 , 1 ) ; // 2000-10-01
2204+ }
2205+ } ,
2206+ value : [ '2000-10-02 00:00:00' , '2000-10-03 00:00:00' ]
2207+ } ;
2208+ }
2209+ } , true ) ;
2210+ const input = vm . $el . querySelector ( 'input' ) ;
2211+
2212+ input . blur ( ) ;
2213+ input . focus ( ) ;
2214+ setTimeout ( _ => {
2215+ // simulate user input of invalid date
2216+ vm . $refs . compo . picker . handleDateChange ( { target : { value : '2000-09-01' } } , 'min' ) ;
2217+ setTimeout ( _ => {
2218+ expect ( vm . $refs . compo . picker . btnDisabled ) . to . equal ( true ) ; // invalid input disables button
2219+ vm . $refs . compo . picker . handleConfirm ( ) ;
2220+ setTimeout ( _ => {
2221+ expect ( vm . $refs . compo . pickerVisible ) . to . equal ( true ) ; // can not confirm, picker remains open
2222+ // simulate click outside to close picker
2223+ vm . $refs . compo . handleClose ( ) ;
2224+ setTimeout ( _ => {
2225+ expect ( vm . value ) . to . eql ( [ '2000-10-02 00:00:00' , '2000-10-03 00:00:00' ] ) ;
2226+ done ( ) ;
2227+ } , DELAY ) ;
2228+ } , DELAY ) ;
2229+ } , DELAY ) ;
2230+ } , DELAY ) ;
2231+ } ) ;
21972232 } ) ;
21982233
21992234 const currentMonth = new Date ( new Date ( ) . getTime ( ) ) ;
0 commit comments