File tree Expand file tree Collapse file tree 2 files changed +19
-24
lines changed Expand file tree Collapse file tree 2 files changed +19
-24
lines changed Original file line number Diff line number Diff line change @@ -14,10 +14,12 @@ export default {
14
14
let count = 0 ;
15
15
this .fields .forEach ( field => {
16
16
this .$set ( this .form [ field .key ], ' $dirty' , true );
17
- console .log (this .$refs [ field .key ][0 ]);
18
- // this.$refs[ field.key ][0].validate();
17
+ this .$refs [ field .key ][0 ].validate ()
18
+ .then (()=> {
19
+ count++ ;
20
+ if ( target == count ) resolve ();
21
+ });
19
22
});
20
- resolve ();
21
23
});
22
24
}
23
25
},
Original file line number Diff line number Diff line change @@ -166,45 +166,38 @@ describe('FormlyForm', () => {
166
166
form : {
167
167
validTest : {
168
168
$dirty : false
169
+ } ,
170
+ validTest2 : {
171
+ $dirty : false
169
172
}
170
173
} ,
171
- model : { validTest :'' } ,
174
+ model : { validTest :'' , validTest2 : '' } ,
172
175
fields : [ {
173
176
key : 'validTest' ,
174
177
type : 'input'
175
- } ]
178
+ } ,
179
+ {
180
+ key : 'validTest2' ,
181
+ type : 'input'
182
+ } ]
176
183
} ;
177
184
178
185
el = document . createElement ( 'DIV' ) ;
179
186
document . body . appendChild ( el ) ;
187
+ Vue . component ( 'formly-field' , ValidField ) ;
180
188
vm = new Vue ( {
181
189
data : data ,
182
- template : '<formly-form :form="form" :model="model" :fields="fields"></formly-form>' ,
183
- components : {
184
- 'formly-field' : ValidField
185
- }
190
+ template : '<formly-form :form="form" :model="model" :fields="fields"></formly-form>'
186
191
} ) . $mount ( el ) ;
187
192
188
193
189
194
let spy = sinon . spy ( ) ;
190
195
191
196
let prom = vm . $children [ 0 ] . validate ( ) ;
192
- prom . then ( ( ) => {
193
- console . log ( 'prom.then' ) ;
194
- } )
195
- . catch ( ( e ) => {
196
- console . log ( 'prom.catch' , e ) ;
197
- } ) ;
198
- return done ( ) ;
199
- expect ( typeof prom . then ) . to . equal ( 'function' ) ;
200
- prom
201
- . then ( ( ) => spy ( ) )
202
- . catch ( ( ) => {
203
-
204
- } ) ;
205
- return done ( ) ;
197
+ prom . then ( ( ) => spy ( ) ) ;
206
198
setTimeout ( ( ) => {
207
- spy . should . be . called ;
199
+ spy . should . be . calledOnce ;
200
+ formlyFieldSpy . should . be . calledTwice ;
208
201
done ( ) ;
209
202
} ) ;
210
203
} ) ;
You can’t perform that action at this time.
0 commit comments